From 151b1854f6ba4c8386d5737ed7cef5da2112af35 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 6 Jul 2023 18:32:23 -0400 Subject: [PATCH] nix-init: 0.2.3 -> 0.2.4 Diff: https://github.com/nix-community/nix-init/compare/v0.2.3...v0.2.4 Changelog: https://github.com/nix-community/nix-init/blob/v0.2.4/CHANGELOG.md --- pkgs/tools/nix/nix-init/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/nix/nix-init/default.nix b/pkgs/tools/nix/nix-init/default.nix index 503c83d4fe15..d6a5df6272f4 100644 --- a/pkgs/tools/nix/nix-init/default.nix +++ b/pkgs/tools/nix/nix-init/default.nix @@ -4,10 +4,9 @@ , fetchFromGitHub , curl , installShellFiles -, makeBinaryWrapper , pkg-config , bzip2 -, libgit2_1_5 +, libgit2 , openssl , zlib , zstd @@ -26,28 +25,27 @@ in rustPlatform.buildRustPackage rec { pname = "nix-init"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-init"; rev = "v${version}"; - hash = "sha256-QxGPBGCCjbQ1QbJNoW0dwQS/srwQ0hBR424zmcqdjI8="; + hash = "sha256-VP0UwJhiY6gDF3tBI1DOW0B4XAl9CzTHzgIP68iF4VM="; }; - cargoHash = "sha256-+Vj3TqNxMgaUmhzCgSEGl58Jh1PLsC6q/DfDbfg2mmo="; + cargoHash = "sha256-x1zRQGWN2NOvDDrQgkeObf6eNoCGMSw3DVgwVqfbI48="; nativeBuildInputs = [ curl installShellFiles - makeBinaryWrapper pkg-config ]; buildInputs = [ bzip2 curl - libgit2_1_5 + libgit2 openssl zlib zstd @@ -76,14 +74,14 @@ rustPlatform.buildRustPackage rec { ''; postInstall = '' - wrapProgram $out/bin/nix-init \ - --prefix PATH : ${lib.makeBinPath [ nix nurl ]} installManPage artifacts/nix-init.1 installShellCompletion artifacts/nix-init.{bash,fish} --zsh artifacts/_nix-init ''; env = { GEN_ARTIFACTS = "artifacts"; + NIX = lib.getExe nix; + NURL = lib.getExe nurl; ZSTD_SYS_USE_PKG_CONFIG = true; };