movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

rustPlatform.buildRustPackage: drop cargoSha256

Browse source
This commit is contained in:
Yueh-Shun Li 2025-02-20 04:00:39 +08:00
parent 3ed140c57c
commit 57793b8ca7
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/release-notes/rl-2505.section.md
View file

@ -59,3 +59,5 @@
- `lib.types.listOf` - `lib.types.listOf`
- Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6. - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6.
- `rustPlatform.buildRustPackage` stops handling the deprecated argument `cargoSha256`. Out-of-tree packages that haven't migrated from `cargoSha256` to `cargoHash` now receive errors.

9
pkgs/build-support/rust/build-rust-package/default.nix
View file

@ -83,7 +83,7 @@ lib.extendMkDerivation {
cargoDeps cargoDeps
else if cargoLock != null then else if cargoLock != null then
importCargoLock cargoLock importCargoLock cargoLock
else if (args.cargoHash or null == null) && (args.cargoSha256 or null == null) then else if args.cargoHash or null == null then
throw "cargoHash, cargoVendorDir, cargoDeps, or cargoLock must be set" throw "cargoHash, cargoVendorDir, cargoDeps, or cargoLock must be set"
else if useFetchCargoVendor then else if useFetchCargoVendor then
fetchCargoVendor ( fetchCargoVendor (
@ -116,15 +116,10 @@ lib.extendMkDerivation {
postUnpack postUnpack
cargoUpdateHook cargoUpdateHook
; ;
hash = args.cargoHash;
name = cargoDepsName; name = cargoDepsName;
patches = cargoPatches; patches = cargoPatches;
} }
// lib.optionalAttrs (args ? cargoHash) {
hash = args.cargoHash;
}
// lib.optionalAttrs (args ? cargoSha256) {
sha256 = lib.warn "cargoSha256 is deprecated. Please use cargoHash with SRI hash instead" args.cargoSha256;
}
// depsExtraArgs // depsExtraArgs
); );