Merge pull request #331966 from vifino/nvme-bumps

nvme-cli: 2.9.1 -> 2.10

pkgs/os-specific/linux/libnvme/default.nix

@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libnvme";
-  version = "1.9";
+  version = "1.10";
 
   outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ];
 
@@ -26,12 +26,12 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "linux-nvme";
     repo = "libnvme";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-nXzYbj4BDxFii30yR+aTgqjQfyYMFiAIcV/OHI2y5Ws=";
+    hash = "sha256-guNABLpDKdWDE79gxoNq0ukAUE7CnMw5QRXA3rl3Dk4=";
   };
 
   postPatch = ''
     patchShebangs scripts
-    substituteInPlace test/sysfs/sysfs-tree-diff.sh \
+    substituteInPlace test/sysfs/tree-diff.sh test/config/config-diff.sh \
       --replace-fail /bin/bash ${bash}/bin/bash
   '';
 

pkgs/os-specific/linux/nvme-cli/default.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nvme-cli";
-  version = "2.9.1";
+  version = "2.10";
 
   src = fetchFromGitHub {
     owner = "linux-nvme";
     repo = "nvme-cli";
     rev = "v${version}";
-    hash = "sha256-zs7UksB5QkvCP29iELDGMJeObvMdKrs6ajQkEzCPzzQ=";
+    hash = "sha256-pFSVCbGiJ+8T2Eeew1M6TZC5Vh46OJDmf7hfU9M26Iw=";
   };
 
   mesonFlags = [