diff options
author | figsoda <figsoda@pm.me> | 2021-10-19 22:41:58 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-19 22:41:58 -0400 |
commit | 5f33ded6018c9bd2e203cd6d7bad4d6a62e46c2f (patch) | |
tree | e5177cb7d5ade613d66301a3084483f75031458a | |
parent | ce4181027814af6c25273057c1ee63c71923d7a7 (diff) | |
parent | f441e6b7f4574c85eb190b52390bbe61f355b514 (diff) | |
download | nixpkgs-5f33ded6018c9bd2e203cd6d7bad4d6a62e46c2f.tar nixpkgs-5f33ded6018c9bd2e203cd6d7bad4d6a62e46c2f.tar.gz nixpkgs-5f33ded6018c9bd2e203cd6d7bad4d6a62e46c2f.tar.bz2 nixpkgs-5f33ded6018c9bd2e203cd6d7bad4d6a62e46c2f.tar.lz nixpkgs-5f33ded6018c9bd2e203cd6d7bad4d6a62e46c2f.tar.xz nixpkgs-5f33ded6018c9bd2e203cd6d7bad4d6a62e46c2f.tar.zst nixpkgs-5f33ded6018c9bd2e203cd6d7bad4d6a62e46c2f.zip |
Merge pull request #142154 from figsoda/cargo-hash-default-null
buildRustPackage,fetchCargoTarball: accept empty hashes
-rw-r--r-- | pkgs/build-support/rust/default.nix | 34 | ||||
-rw-r--r-- | pkgs/build-support/rust/fetchCargoTarball.nix | 6 |
2 files changed, 16 insertions, 24 deletions
diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 2eb45bcafa1..3d7057dd7d9 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,17 +1,15 @@ -{ stdenv -, lib -, buildPackages +{ lib +, importCargoLock +, fetchCargoTarball +, rust +, stdenv +, callPackage , cacert +, git , cargoBuildHook , cargoCheckHook , cargoInstallHook , cargoSetupHook -, fetchCargoTarball -, importCargoLock -, rustPlatform -, callPackage -, git -, rust , rustc , libiconv , windows @@ -19,12 +17,6 @@ { name ? "${args.pname}-${args.version}" - # SRI hash -, cargoHash ? "" - - # Legacy hash -, cargoSha256 ? "" - # Name for the vendored dependencies tarball , cargoDepsName ? name @@ -56,7 +48,7 @@ , buildAndTestSubdir ? null , ... } @ args: -assert cargoVendorDir == null && cargoLock == null -> cargoSha256 == "" && cargoHash == "" +assert cargoVendorDir == null && cargoLock == null -> !(args ? cargoSha256) && !(args ? cargoHash) -> throw "cargoSha256, cargoHash, cargoVendorDir, or cargoLock must be set"; assert buildType == "release" || buildType == "debug"; @@ -68,15 +60,17 @@ let else fetchCargoTarball ({ inherit src srcs sourceRoot unpackPhase cargoUpdateHook; name = cargoDepsName; - hash = cargoHash; patches = cargoPatches; - sha256 = cargoSha256; + } // lib.optionalAttrs (args ? cargoHash) { + hash = args.cargoHash; + } // lib.optionalAttrs (args ? cargoSha256) { + sha256 = args.cargoSha256; } // depsExtraArgs) else null; # If we have a cargoSha256 fixed-output derivation, validate it at build time # against the src fixed-output derivation to check consistency. - validateCargoDeps = !(cargoHash == "" && cargoSha256 == ""); + validateCargoDeps = args ? cargoHash || args ? cargoSha256; target = rust.toRustTargetSpec stdenv.hostPlatform; targetIsJSON = lib.hasSuffix ".json" target; @@ -88,7 +82,7 @@ let (lib.removeSuffix ".json" (builtins.baseNameOf "${target}")) else target; - sysroot = (callPackage ./sysroot {}) { + sysroot = callPackage ./sysroot { } { inherit target shortTarget; RUSTFLAGS = args.RUSTFLAGS or ""; originalCargoToml = src + /Cargo.toml; # profile info is later extracted diff --git a/pkgs/build-support/rust/fetchCargoTarball.nix b/pkgs/build-support/rust/fetchCargoTarball.nix index 2e8830b4757..c2be9aac82d 100644 --- a/pkgs/build-support/rust/fetchCargoTarball.nix +++ b/pkgs/build-support/rust/fetchCargoTarball.nix @@ -22,15 +22,13 @@ in , srcs ? [] , patches ? [] , sourceRoot ? "" -, hash ? "" -, sha256 ? "" , cargoUpdateHook ? "" , ... } @ args: let hash_ = - if hash != "" then { outputHashAlgo = null; outputHash = hash; } - else if sha256 != "" then { outputHashAlgo = "sha256"; outputHash = sha256; } + if args ? hash then { outputHashAlgo = null; outputHash = args.hash; } + else if args ? sha256 then { outputHashAlgo = "sha256"; outputHash = args.sha256; } else throw "fetchCargoTarball requires a hash for ${name}"; in stdenv.mkDerivation ({ name = "${name}-vendor.tar.gz"; |