diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2024-01-07 16:14:41 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2024-01-07 16:14:41 +0100 |
| commit | ff42d23313880d627c7dea5addf744db4562dee5 (patch) | |
| tree | c9b37f000821c6e8e2e39d983ce8ea25a56e949c /pkgs/os-specific/linux/libnvme/default.nix | |
| parent | 798690dc6b55c17705f9f2faab07d5b86b6d50d4 (diff) | |
| parent | 9ea3a3cfaa995c201b68c1cd3877bd35e1d7dd04 (diff) | |
| download | nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.gz nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.bz2 nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.lz nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.xz nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.zst nixlib-ff42d23313880d627c7dea5addf744db4562dee5.zip | |
Merge branch 'master' into staging-next
Conflicts: pkgs/development/python-modules/dbt-core/default.nix pkgs/development/python-modules/dbt-semantic-interfaces/default.nix Still broken by pydantic 2 bump, though.
Diffstat (limited to 'pkgs/os-specific/linux/libnvme/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/libnvme/default.nix | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix index 321d15ce6c5d..34c798ca3355 100644 --- a/pkgs/os-specific/linux/libnvme/default.nix +++ b/pkgs/os-specific/linux/libnvme/default.nix @@ -11,14 +11,13 @@ , stdenv , swig , systemd -, fetchpatch # ImportError: cannot import name 'mlog' from 'mesonbuild' , withDocs ? stdenv.hostPlatform.canExecute stdenv.buildPlatform }: stdenv.mkDerivation (finalAttrs: { pname = "libnvme"; - version = "1.6"; + version = "1.7.1"; outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ]; @@ -26,27 +25,9 @@ stdenv.mkDerivation (finalAttrs: { owner = "linux-nvme"; repo = "libnvme"; rev = "v${finalAttrs.version}"; - hash = "sha256-7bvjsmt16/6RycSDKIECtJ4ES7NTaspU6IMpUw0sViA="; + hash = "sha256-hCR/K8bPXj8HthayrnwwGfI+wxpUwcWkcx3S/8h+3m8="; }; - patches = [ - # included in next release - (fetchpatch { - 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 = '' patchShebangs scripts ''; |