nh: 3.5.3 -> 3.5.4
This commit is contained in:
parent
f91f52a6fe
commit
555ede9f6c
1 changed files with 6 additions and 11 deletions
|
@ -7,15 +7,11 @@
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
, nvd
|
, nvd
|
||||||
, use-nom ? true
|
, nix-output-monitor
|
||||||
, nix-output-monitor ? null
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert use-nom -> nix-output-monitor != null;
|
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "3.5.3";
|
version = "3.5.4";
|
||||||
runtimeDeps = [ nvd ] ++ lib.optionals use-nom [ nix-output-monitor ];
|
runtimeDeps = [ nvd nix-output-monitor ];
|
||||||
in
|
in
|
||||||
rustPlatform.buildRustPackage {
|
rustPlatform.buildRustPackage {
|
||||||
inherit version;
|
inherit version;
|
||||||
|
@ -25,7 +21,7 @@ rustPlatform.buildRustPackage {
|
||||||
owner = "viperML";
|
owner = "viperML";
|
||||||
repo = "nh";
|
repo = "nh";
|
||||||
rev = "refs/tags/v${version}";
|
rev = "refs/tags/v${version}";
|
||||||
hash = "sha256-37BcFt67NZj4YQ9kqm69O+OJkgt+TXWTu53bvJvOtn8=";
|
hash = "sha256-fnuVQqdK48c66EC4mL8t7uLhwsY6JDyn7H5tjRpx9Sg=";
|
||||||
};
|
};
|
||||||
|
|
||||||
strictDeps = true;
|
strictDeps = true;
|
||||||
|
@ -48,11 +44,10 @@ rustPlatform.buildRustPackage {
|
||||||
|
|
||||||
postFixup = ''
|
postFixup = ''
|
||||||
wrapProgram $out/bin/nh \
|
wrapProgram $out/bin/nh \
|
||||||
--prefix PATH : ${lib.makeBinPath runtimeDeps} \
|
--prefix PATH : ${lib.makeBinPath runtimeDeps}
|
||||||
${lib.optionalString use-nom "--set-default NH_NOM 1"}
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
cargoHash = "sha256-uRibycYznqzdf8QVX6bHfq3J3Imu8KnWCL0ZS1w4KFk=";
|
cargoHash = "sha256-njJdwaJtLB4S36mS8miwrk7jo5U7BzOIlXqh3qNyA5E=";
|
||||||
|
|
||||||
passthru.updateScript = nix-update-script { };
|
passthru.updateScript = nix-update-script { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue