Skip to content

[Backport release-25.11] various: use finalAttrs#487163

Open
matthiasbeyer wants to merge 12 commits intoNixOS:release-25.11from
matthiasbeyer:backport-486938-to-release-25.11
Open

[Backport release-25.11] various: use finalAttrs#487163
matthiasbeyer wants to merge 12 commits intoNixOS:release-25.11from
matthiasbeyer:backport-486938-to-release-25.11

Conversation

@matthiasbeyer
Copy link
Contributor

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

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

(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>
@matthiasbeyer matthiasbeyer requested review from figsoda, lf- and winterqt and removed request for figsoda February 5, 2026 08:32
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@matthiasbeyer matthiasbeyer dismissed github-actions[bot]’s stale review February 5, 2026 08:47

Patches could not be cherry-picked automatically because of different package versions on master and release branch. TL;DR: Resolved conflicts by hand

@SigmaSquadron SigmaSquadron changed the title Backport 486938 to release 25.11 [ackport release-25.11] various: use finalAttrs Feb 5, 2026
@SigmaSquadron SigmaSquadron changed the title [ackport release-25.11] various: use finalAttrs [Backport release-25.11] various: use finalAttrs Feb 5, 2026
@matthiasbeyer
Copy link
Contributor Author

I am not sure how I can trigger the CI here... nixpkgs-review won't run until github actions ran apparently 🤔

@figsoda
Copy link
Member

figsoda commented Feb 6, 2026

I don't think buildPython* supports finalAttrs on release-25.11, the backport pr for it (#476950) is not merged yet

@matthiasbeyer matthiasbeyer force-pushed the backport-486938-to-release-25.11 branch from de0258f to f715f4d Compare February 6, 2026 07:07
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@matthiasbeyer
Copy link
Contributor Author

Ah okay, I removed the buildPython commit 😉

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 4.workflow: backport This targets a stable branch labels Feb 6, 2026
@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Feb 6, 2026
@nixpkgs-ci nixpkgs-ci bot added 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. 2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". labels Feb 18, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge-bot eligible This PR can be merged by commenting "@NixOS/nixpkgs-merge-bot merge". 4.workflow: backport This targets a stable branch 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants