From d0816cb45fcd91813d6312213d33388756ce8990 Mon Sep 17 00:00:00 2001 From: pongo1231 Date: Sun, 19 Nov 2023 13:55:54 +0100 Subject: [PATCH] duperemove: 0.13 -> 0.14 --- pkgs/tools/filesystems/duperemove/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index fd2be83691a1..f637996536dd 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch2 , libgcrypt , pkg-config , glib @@ -14,31 +13,22 @@ stdenv.mkDerivation rec { pname = "duperemove"; - version = "0.13"; + version = "0.14"; src = fetchFromGitHub { owner = "markfasheh"; repo = "duperemove"; rev = "v${version}"; - hash = "sha256-D3+p8XgokKIHEwZnvOkn7cionVH1gsypcURF+PBpugY="; + hash = "sha256-dz7ZswOUDmWxzVM3j5GTlC/Tu8Wfgyn1QT5nIqBanrs="; }; - patches = [ - # Use variable instead of hardcoding pkg-config - # https://github.com/markfasheh/duperemove/pull/315 - (fetchpatch2 { - url = "https://github.com/markfasheh/duperemove/commit/0e1c62d79a9a79d7bb3e80f1bd528dbf7cb75e22.patch"; - hash = "sha256-YMMu6LCkBlipEJALukQMwIMcjQEAG5pjGEGeTW9OEJk="; - }) - ]; - postPatch = '' substituteInPlace util.c --replace \ "lscpu" "${lib.getBin util-linux}/bin/lscpu" ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libgcrypt glib linuxHeaders sqlite ]; + buildInputs = [ libgcrypt glib linuxHeaders sqlite util-linux ]; makeFlags = [ "PREFIX=${placeholder "out"}"