diff options
| author | maxine <35892750+amaxine@users.noreply.github.com> | 2024-01-07 15:05:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-07 15:05:35 +0100 |
| commit | 0928e0dbe0e58717af7bdca628a572e6c251bda7 (patch) | |
| tree | b372367fa7e09a83626105e5eb50a14a26b4d414 /pkgs/os-specific | |
| parent | f14a8d6e50fc850099e658e7c0bf53278332612f (diff) | |
| parent | 17d6a38665e5fc9ed3c1cd54f9b8dce9cff1bd86 (diff) | |
| download | nixlib-0928e0dbe0e58717af7bdca628a572e6c251bda7.tar nixlib-0928e0dbe0e58717af7bdca628a572e6c251bda7.tar.gz nixlib-0928e0dbe0e58717af7bdca628a572e6c251bda7.tar.bz2 nixlib-0928e0dbe0e58717af7bdca628a572e6c251bda7.tar.lz nixlib-0928e0dbe0e58717af7bdca628a572e6c251bda7.tar.xz nixlib-0928e0dbe0e58717af7bdca628a572e6c251bda7.tar.zst nixlib-0928e0dbe0e58717af7bdca628a572e6c251bda7.zip | |
Merge pull request #275436 from vifino/nvme-updates
libnvme: 1.6 -> 1.7.1; nvme-cli: 2.6 -> 2.7
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/libnvme/default.nix | 23 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvme-cli/default.nix | 6 |
2 files changed, 4 insertions, 25 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 ''; diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index e0d0372fd6ff..d10900d3958a 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - hash = "sha256-MFyBkwTNOBQdHWj7In1OquRIAsjsd4/DHYfUyFA9YDQ="; + hash = "sha256-qijzXucNE+M8fOEtNaoQYX41HeJOMtg/cJFCUJyS6Ew="; }; mesonFlags = [ @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { libnvme json_c zlib - ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform libhugetlbfs) [ - libhugetlbfs ]; meta = with lib; { |