Skip to content

buildRustPackage: simplify the cargoDeps specification and remove dead code#384345

Merged
ShamrockLee merged 3 commits intoNixOS:masterfrom
ShamrockLee:build-rust-package-misc
Feb 25, 2025
Merged

buildRustPackage: simplify the cargoDeps specification and remove dead code#384345
ShamrockLee merged 3 commits intoNixOS:masterfrom
ShamrockLee:build-rust-package-misc

Conversation

@ShamrockLee
Copy link
Contributor

These chore clean-ups aim to simplify the buildRustPackage code and create a cleaner ground for future overriding fixes and potential interface changes.

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.

cargoDeps gets shadowed in the implementation
whether or not it is excluded.
@github-actions github-actions bot added 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. labels Feb 22, 2025
@ShamrockLee
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 384345

@ShamrockLee ShamrockLee marked this pull request as ready for review February 23, 2025 19:50
@nix-owners nix-owners bot requested review from figsoda, winterqt and zowoq February 23, 2025 19:51
@zowoq
Copy link
Contributor

zowoq commented Feb 24, 2025

Typo in the last commit, cardoDeps.

@ShamrockLee ShamrockLee force-pushed the build-rust-package-misc branch from edf8358 to 89c72ca Compare February 24, 2025 16:27
@ShamrockLee
Copy link
Contributor Author

ShamrockLee commented Feb 24, 2025

Typo in the last commit, cardoDeps.

@zowoq Addressed. Thank you for reviewing!

@ShamrockLee ShamrockLee merged commit 21b5476 into NixOS:master Feb 25, 2025
26 of 27 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Mar 19, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-384345-to-release-24.11 origin/release-24.11
cd .worktree/backport-384345-to-release-24.11
git switch --create backport-384345-to-release-24.11
git cherry-pick -x ef987dba19b88e589718eb99c78a5e59e4e85967 d84d1eeb22a19def830ffa180fc2d004c3c69eb1 89c72ca6a20bde0b6acaebaa323eee7f1eb0ea14

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.

2 participants