Unverified Commit abe7316d authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

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

nvme-cli & libnvme: 2.2.1 -> 2.4 and 1.2 -> 1.4
parents 3d8a9bdb 8a8b88f3

pkgs/os-specific/linux/libnvme/default.nix

+6 −2
Original line number Diff line number Diff line 
{ 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

pkgs/os-specific/linux/nvme-cli/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [