Skip to content

[Backport release-24.11] buildRustPackage: support fixed-point arguments via lib.extendMkDerivation#391398

Merged
JohnRTitor merged 3 commits intoNixOS:release-24.11from
ShamrockLee:backport-build-rust-package-finalattrs
Mar 21, 2025
Merged

[Backport release-24.11] buildRustPackage: support fixed-point arguments via lib.extendMkDerivation#391398
JohnRTitor merged 3 commits intoNixOS:release-24.11from
ShamrockLee:backport-build-rust-package-finalattrs

Conversation

@ShamrockLee
Copy link
Contributor

This is the manual backport of PR #382550.

This PR enables future backports of Rust package changes which use finalAttrs.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

Move assertions down to the corresponding attribute value.

Avoid adding assertions to the whole argument set.

(cherry picked from commit 016ba92)
Support fixed-point arguments with lib.extendMkDerivation

Postpone formatting for more concise diff.

(cherry picked from commit 7609cba)
@github-actions github-actions bot added the 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. label Mar 19, 2025
@ShamrockLee
Copy link
Contributor Author

@GaetanLepage Could you help test if this makes the desired Rust package backports work?

@github-actions github-actions 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. labels Mar 19, 2025
@ShamrockLee ShamrockLee marked this pull request as ready for review March 20, 2025 08:47
@nix-owners nix-owners bot requested review from figsoda, winterqt and zowoq March 20, 2025 08:49
@ShamrockLee ShamrockLee requested a review from JohnRTitor March 20, 2025 16:12
@GaetanLepage
Copy link
Contributor

@GaetanLepage Could you help test if this makes the desired Rust package backports work?

It seems to work fine indeed. I was able to migrate a package to the finalAttrs pattern.

@JohnRTitor JohnRTitor merged commit 5c398df into NixOS:release-24.11 Mar 21, 2025
39 checks passed
@ShamrockLee ShamrockLee deleted the backport-build-rust-package-finalattrs branch March 21, 2025 14:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants