diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-06-10 13:50:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-10 13:50:50 +0200 |
| commit | f4a9d6edb40f33ae7d0e0f45a9282885ead4b8f3 (patch) | |
| tree | 0aa226e7e3f24bdbd140c37b1a73f9ccf8c897dd /pkgs/os-specific | |
| parent | d121850173d646f6b3597abc53e5aec016030958 (diff) | |
| parent | de3e916be82759d082a3bbfd509a8863252461be (diff) | |
Merge pull request #309932 from mmlb/update-nvme-cli
libnvme: 1.7.1 -> 1.9; nvme-cli: 2.7.1 -> 2.9.1
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/libnvme/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvme-cli/default.nix | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix index 7346e0d67d391..4d86812698e5a 100644 --- a/pkgs/os-specific/linux/libnvme/default.nix +++ b/pkgs/os-specific/linux/libnvme/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, bash , json_c , keyutils , lib @@ -17,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libnvme"; - version = "1.7.1"; + version = "1.9"; outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ]; @@ -25,11 +26,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "linux-nvme"; repo = "libnvme"; rev = "v${finalAttrs.version}"; - hash = "sha256-hCR/K8bPXj8HthayrnwwGfI+wxpUwcWkcx3S/8h+3m8="; + hash = "sha256-nXzYbj4BDxFii30yR+aTgqjQfyYMFiAIcV/OHI2y5Ws="; }; postPatch = '' patchShebangs scripts + substituteInPlace test/sysfs/sysfs-tree-diff.sh \ + --replace-fail /bin/bash ${bash}/bin/bash ''; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index d909e331871be..a39c26ac7c199 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "2.7.1"; + version = "2.9.1"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - hash = "sha256-Gm+1tb/Nh+Yg2PgSUn/1hR4CZYnfTWRwcQU0A8UeQwI="; + hash = "sha256-zs7UksB5QkvCP29iELDGMJeObvMdKrs6ajQkEzCPzzQ="; }; mesonFlags = [ |