Merge pull request #198471 from ifurther/nvme

nvme-cli: 2.1 -> 2.2.1 and libnvme: 1.1 -> 1.2

authored by ajs124 and committed by GitHub 5e4062b9 99ccf215

+4 -8
+2 -4
pkgs/os-specific/linux/libnvme/default.nix
··· 1 { fetchFromGitHub 2 , json_c 3 , lib 4 - , libuuid 5 , meson 6 , ninja 7 , openssl ··· 14 15 stdenv.mkDerivation rec { 16 pname = "libnvme"; 17 - version = "1.1"; 18 19 outputs = [ "out" "man" ]; 20 ··· 22 owner = "linux-nvme"; 23 repo = "libnvme"; 24 rev = "v${version}"; 25 - sha256 = "EPAPWY6/Bh8I1eLslKJAofLn0IAizmGn00Q5PJPtdRw="; 26 }; 27 28 postPatch = '' ··· 40 41 buildInputs = [ 42 json_c 43 - libuuid 44 openssl 45 python3 46 systemd
··· 1 { fetchFromGitHub 2 , json_c 3 , lib 4 , meson 5 , ninja 6 , openssl ··· 13 14 stdenv.mkDerivation rec { 15 pname = "libnvme"; 16 + version = "1.2"; 17 18 outputs = [ "out" "man" ]; 19 ··· 21 owner = "linux-nvme"; 22 repo = "libnvme"; 23 rev = "v${version}"; 24 + sha256 = "sha256-U9Fj3OcBe32C0PKhI05eF/6jikHAvdyvXH16IY0rWxI="; 25 }; 26 27 postPatch = '' ··· 39 40 buildInputs = [ 41 json_c 42 openssl 43 python3 44 systemd
+2 -4
pkgs/os-specific/linux/nvme-cli/default.nix
··· 1 { lib, stdenv, fetchFromGitHub, pkg-config 2 , meson 3 , ninja 4 - , libuuid 5 , libnvme 6 , json_c 7 , zlib ··· 10 11 stdenv.mkDerivation rec { 12 pname = "nvme-cli"; 13 - version = "2.1.2"; 14 15 src = fetchFromGitHub { 16 owner = "linux-nvme"; 17 repo = "nvme-cli"; 18 rev = "v${version}"; 19 - hash = "sha256-ZjgysgWMmBlN+aalI5u2vQ58XrtEbJlDPCqUN6avv08="; 20 }; 21 22 mesonFlags = [ ··· 30 python3.pkgs.nose2 31 ]; 32 buildInputs = [ 33 - libuuid 34 libnvme 35 json_c 36 zlib
··· 1 { lib, stdenv, fetchFromGitHub, pkg-config 2 , meson 3 , ninja 4 , libnvme 5 , json_c 6 , zlib ··· 9 10 stdenv.mkDerivation rec { 11 pname = "nvme-cli"; 12 + version = "2.2.1"; 13 14 src = fetchFromGitHub { 15 owner = "linux-nvme"; 16 repo = "nvme-cli"; 17 rev = "v${version}"; 18 + hash = "sha256-okYtGiKUPNO31ntD9j5iAgdcnS5OQ/g1QAY+svhga4c="; 19 }; 20 21 mesonFlags = [ ··· 29 python3.pkgs.nose2 30 ]; 31 buildInputs = [ 32 libnvme 33 json_c 34 zlib