public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38573 from kevincox/allow-null

Browse Source 
Allow setting cargoSha256 to null.
This commit is contained in:
Jörg Thalheim 2018-04-08 08:56:52 +01:00 committed by GitHub
commit 51655575d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/rust/default.nix
View File

@ -4,7 +4,7 @@ let
inherit stdenv cacert git rust cargo-vendor; inherit stdenv cacert git rust cargo-vendor;
}; };
in in
{ name, cargoSha256 ? null { name, cargoSha256 ? "unset"
, src ? null , src ? null
, srcs ? null , srcs ? null
, sourceRoot ? null , sourceRoot ? null
@ -17,7 +17,7 @@ in
, cargoVendorDir ? null , cargoVendorDir ? null
, ... } @ args: , ... } @ args:
assert cargoVendorDir == null -> cargoSha256 != null; assert cargoVendorDir == null -> cargoSha256 != "unset";
let let
lib = stdenv.lib; lib = stdenv.lib;