Merge pull request #294756 from viperML/nh-update

nh: 3.5.3 -> 3.5.4
This commit is contained in:
Pol Dellaiera 2024-03-10 17:31:01 +01:00 committed by GitHub
commit 3f61120136
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -7,15 +7,11 @@
, fetchFromGitHub
, nix-update-script
, nvd
, use-nom ? true
, nix-output-monitor ? null
, nix-output-monitor
}:
assert use-nom -> nix-output-monitor != null;
let
version = "3.5.3";
runtimeDeps = [ nvd ] ++ lib.optionals use-nom [ nix-output-monitor ];
version = "3.5.4";
runtimeDeps = [ nvd nix-output-monitor ];
in
rustPlatform.buildRustPackage {
inherit version;
@ -25,7 +21,7 @@ rustPlatform.buildRustPackage {
owner = "viperML";
repo = "nh";
rev = "refs/tags/v${version}";
hash = "sha256-37BcFt67NZj4YQ9kqm69O+OJkgt+TXWTu53bvJvOtn8=";
hash = "sha256-fnuVQqdK48c66EC4mL8t7uLhwsY6JDyn7H5tjRpx9Sg=";
};
strictDeps = true;
@ -48,11 +44,10 @@ rustPlatform.buildRustPackage {
postFixup = ''
wrapProgram $out/bin/nh \
--prefix PATH : ${lib.makeBinPath runtimeDeps} \
${lib.optionalString use-nom "--set-default NH_NOM 1"}
--prefix PATH : ${lib.makeBinPath runtimeDeps}
'';
cargoHash = "sha256-uRibycYznqzdf8QVX6bHfq3J3Imu8KnWCL0ZS1w4KFk=";
cargoHash = "sha256-njJdwaJtLB4S36mS8miwrk7jo5U7BzOIlXqh3qNyA5E=";
passthru.updateScript = nix-update-script { };