Unverified Commit 3f611201 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #294756 from viperML/nh-update 

nh: 3.5.3 -> 3.5.4
parents 91686dd2 555ede9f

pkgs/by-name/nh/nh/package.nix

+6 −11
Original line number Diff line number Diff line
@@ -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 { };