From 5fe45ebfeae9ee262771fc17cefdc5edf30f135c Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Thu, 13 Apr 2023 21:02:48 +0100 Subject: [PATCH 1/2] nvme-cli: 2.2.1 -> 2.4 --- pkgs/os-specific/linux/nvme-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 307cc51a0bd8..d267a12266bd 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "2.2.1"; + version = "2.4"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - hash = "sha256-okYtGiKUPNO31ntD9j5iAgdcnS5OQ/g1QAY+svhga4c="; + hash = "sha256-vnhvVVfEDnmEIdIkfTRoiLB7dZ1rJV3U4PmUUoaxTUs="; }; mesonFlags = [ From 8a8b88f3da0f46ddad6078d9214297d3c5d55d28 Mon Sep 17 00:00:00 2001 From: Noah Santschi-Cooney Date: Thu, 13 Apr 2023 21:01:25 +0100 Subject: [PATCH 2/2] libnvme: 1.2 -> 1.4 --- pkgs/os-specific/linux/libnvme/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libnvme/default.nix b/pkgs/os-specific/linux/libnvme/default.nix index 6e7244ad8b99..17fad5410024 100644 --- a/pkgs/os-specific/linux/libnvme/default.nix +++ b/pkgs/os-specific/linux/libnvme/default.nix @@ -1,5 +1,6 @@ { fetchFromGitHub , json_c +, keyutils , lib , meson , ninja @@ -8,12 +9,13 @@ , pkg-config , python3 , stdenv +, swig , systemd }: stdenv.mkDerivation rec { pname = "libnvme"; - version = "1.2"; + version = "1.4"; outputs = [ "out" "man" ]; @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { owner = "linux-nvme"; repo = "libnvme"; rev = "v${version}"; - sha256 = "sha256-U9Fj3OcBe32C0PKhI05eF/6jikHAvdyvXH16IY0rWxI="; + sha256 = "sha256-8DlEQ4LH6UhIHr0znJGqkuCosLHqA6hkJjmiCawNE1k="; }; postPatch = '' @@ -36,9 +38,11 @@ stdenv.mkDerivation rec { perl # for kernel-doc pkg-config python3 + swig ]; buildInputs = [ + keyutils json_c openssl systemd