about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2023-12-14 16:22:39 +0100
committerGitHub <noreply@github.com>2023-12-14 16:22:39 +0100
commitc37e46872770799d46fdc3f2af912c4fa6d9b3fe (patch)
tree7610227a70ce9cbafdae84168b14366e1f9affcb /pkgs
parent3841ac3c5ff73028da90f897ea471565fba3d6eb (diff)
parenta70abc68407355a4f7acef92320ddf8c150e32ed (diff)
downloadnixlib-c37e46872770799d46fdc3f2af912c4fa6d9b3fe.tar
nixlib-c37e46872770799d46fdc3f2af912c4fa6d9b3fe.tar.gz
nixlib-c37e46872770799d46fdc3f2af912c4fa6d9b3fe.tar.bz2
nixlib-c37e46872770799d46fdc3f2af912c4fa6d9b3fe.tar.lz
nixlib-c37e46872770799d46fdc3f2af912c4fa6d9b3fe.tar.xz
nixlib-c37e46872770799d46fdc3f2af912c4fa6d9b3fe.tar.zst
nixlib-c37e46872770799d46fdc3f2af912c4fa6d9b3fe.zip
Merge pull request #272925 from vifino/libnvme-fix-alignment
libnvme: apply ns scan payload alignment patch
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/libnvme/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix
index aee0dc1e0094..321d15ce6c5d 100644
--- a/pkgs/os-specific/linux/libnvme/default.nix
+++ b/pkgs/os-specific/linux/libnvme/default.nix
@@ -35,6 +35,16 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/linux-nvme/libnvme/commit/ff742e792725c316ba6de0800188bf36751bd1d1.patch";
       hash = "sha256-IUjPUBmGQC4oAKFFlBrjonqD2YdyNPC9siK4t/t2slE=";
     })
+    # included in next release
+    (fetchpatch {
+      url = "https://github.com/linux-nvme/libnvme/commit/a2b8e52e46cfd888ac5a48d8ce632bd70a5caa93.patch";
+      hash = "sha256-AVSWraFriErfz7dA2CjU8+ehJtAmuLxBZyBALygmrf0=";
+    })
+    # included in next release
+    (fetchpatch {
+      url = "https://github.com/linux-nvme/libnvme/commit/68c6ffb11d40a427fc1fd70ac2ac97fd01952913.patch";
+      hash = "sha256-dvc1sjgCFU31/LornvJ/aRVYtPOsewkas0jS+/AwFuU=";
+    })
   ];
 
   postPatch = ''