Unverified Commit f4a9d6ed authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #309932 from mmlb/update-nvme-cli 

libnvme: 1.7.1 -> 1.9; nvme-cli: 2.7.1 -> 2.9.1
parents d1218501 de3e916b

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

+5 −2
Original line number Diff line number Diff line 
{ fetchFromGitHub

, bash

, json_c

, keyutils

, lib
@@ -17,7 +18,7 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "libnvme";

  version = "1.7.1";

  version = "1.9";



  outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ];
@@ -25,11 +26,13 @@ stdenv.mkDerivation (finalAttrs: { 
    owner = "linux-nvme";

    repo = "libnvme";

    rev = "v${finalAttrs.version}";

    hash = "sha256-hCR/K8bPXj8HthayrnwwGfI+wxpUwcWkcx3S/8h+3m8=";

    hash = "sha256-nXzYbj4BDxFii30yR+aTgqjQfyYMFiAIcV/OHI2y5Ws=";

  };



  postPatch = ''

    patchShebangs scripts

    substituteInPlace test/sysfs/sysfs-tree-diff.sh \

      --replace-fail /bin/bash ${bash}/bin/bash

  '';



  nativeBuildInputs = [

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.7.1";

  version = "2.9.1";



  src = fetchFromGitHub {

    owner = "linux-nvme";

    repo = "nvme-cli";

    rev = "v${version}";

    hash = "sha256-Gm+1tb/Nh+Yg2PgSUn/1hR4CZYnfTWRwcQU0A8UeQwI=";

    hash = "sha256-zs7UksB5QkvCP29iELDGMJeObvMdKrs6ajQkEzCPzzQ=";

  };



  mesonFlags = [