dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #226072 from Strum355/nvme-cli-bump

Browse Source 
nvme-cli & libnvme: 2.2.1 -> 2.4 and 1.2 -> 1.4
This commit is contained in:
Weijia Wang 2023-04-14 12:45:17 +03:00 committed by GitHub
commit abe7316dd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/libnvme/default.nix
View File

@ -1,5 +1,6 @@
{ fetchFromGitHub { fetchFromGitHub
, json_c , json_c
, keyutils
, lib , lib
, meson , meson
, ninja , ninja
@ -8,12 +9,13 @@
, pkg-config , pkg-config
, python3 , python3
, stdenv , stdenv
, swig
, systemd , systemd
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libnvme"; pname = "libnvme";
version = "1.2"; version = "1.4";
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "linux-nvme"; owner = "linux-nvme";
repo = "libnvme"; repo = "libnvme";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-U9Fj3OcBe32C0PKhI05eF/6jikHAvdyvXH16IY0rWxI="; sha256 = "sha256-8DlEQ4LH6UhIHr0znJGqkuCosLHqA6hkJjmiCawNE1k=";
}; };
postPatch = '' postPatch = ''
@ -36,9 +38,11 @@ stdenv.mkDerivation rec {
perl # for kernel-doc perl # for kernel-doc
pkg-config pkg-config
python3 python3
swig
]; ];
buildInputs = [ buildInputs = [
keyutils
json_c json_c
openssl openssl
systemd systemd

4
pkgs/os-specific/linux/nvme-cli/default.nix
View File

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "nvme-cli"; pname = "nvme-cli";
version = "2.2.1"; version = "2.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "linux-nvme"; owner = "linux-nvme";
repo = "nvme-cli"; repo = "nvme-cli";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-okYtGiKUPNO31ntD9j5iAgdcnS5OQ/g1QAY+svhga4c="; hash = "sha256-vnhvVVfEDnmEIdIkfTRoiLB7dZ1rJV3U4PmUUoaxTUs=";
}; };
mesonFlags = [ mesonFlags = [