[Backport release-25.11] various: use finalAttrs#487163
[Backport release-25.11] various: use finalAttrs#487163matthiasbeyer wants to merge 12 commits intoNixOS:release-25.11from
Conversation
(cherry picked from commit 95b818a) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 7072712) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 6d511b3) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 034a17f) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 4a52bba) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 35a0098) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit f5f2f5e) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit d37f2a1) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 6a8d682) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 5d04ea3) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 3d460ad) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
(cherry picked from commit 97061e2) Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between d8c54cc and original 6d511b3 may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
cargo-nextest: use finalAttrs
+ (cherry picked from commit 6d511b35b920229fec5cbbef897816641b7d6273)
+ Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
+
## pkgs/by-name/ca/cargo-nextest/package.nix ##
@@
nix-update-script,
@@ pkgs/by-name/ca/cargo-nextest/package.nix
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-nextest";
- version = "0.9.124";
+ version = "0.9.114";
src = fetchFromGitHub {
owner = "nextest-rs";
repo = "nextest";
-- tag = "cargo-nextest-${version}";
+- rev = "cargo-nextest-${version}";
+ tag = "cargo-nextest-${finalAttrs.version}";
- hash = "sha256-qvJ/dqbls2fVSPY++kYBIeiu14eDD8ORuvcD8dEtMZ8=";
+ hash = "sha256-0l8+YKIdKhvwdEbvSgYcX1deq+aRZkxXUCw2zMSO4cU=";
};
@@ pkgs/by-name/ca/cargo-nextest/package.nix: rustPlatform.buildRustPackage rec {
- chrjabs
+ matthiasbeyer
];
};
-}
Hint: The full diffs are also available in the runner logs with slightly better highlighting.
Patches could not be cherry-picked automatically because of different package versions on master and release branch. TL;DR: Resolved conflicts by hand
|
I am not sure how I can trigger the CI here... |
|
I don't think buildPython* supports finalAttrs on release-25.11, the backport pr for it (#476950) is not merged yet |
de0258f to
f715f4d
Compare
There was a problem hiding this comment.
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
Warning
Difference between d8c54cc and original 6d511b3 may warrant inspection.
Show diff
@@ Metadata
## Commit message ##
cargo-nextest: use finalAttrs
+ (cherry picked from commit 6d511b35b920229fec5cbbef897816641b7d6273)
+ Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
+
## pkgs/by-name/ca/cargo-nextest/package.nix ##
@@
nix-update-script,
@@ pkgs/by-name/ca/cargo-nextest/package.nix
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-nextest";
- version = "0.9.124";
+ version = "0.9.114";
src = fetchFromGitHub {
owner = "nextest-rs";
repo = "nextest";
-- tag = "cargo-nextest-${version}";
+- rev = "cargo-nextest-${version}";
+ tag = "cargo-nextest-${finalAttrs.version}";
- hash = "sha256-qvJ/dqbls2fVSPY++kYBIeiu14eDD8ORuvcD8dEtMZ8=";
+ hash = "sha256-0l8+YKIdKhvwdEbvSgYcX1deq+aRZkxXUCw2zMSO4cU=";
};
@@ pkgs/by-name/ca/cargo-nextest/package.nix: rustPlatform.buildRustPackage rec {
- chrjabs
+ matthiasbeyer
];
};
-}
Hint: The full diffs are also available in the runner logs with slightly better highlighting.
|
Ah okay, I removed the |
Warning
This will most likely conflict with the normal package updates being backported.
I think it is worth it though.
Let's see what my CI run tells us about this patchset.
(And thanks to the original contributor at #486938 - @chrjabs ❤️ )
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.