From 9ef100c35323c4dfd011362947970967eb2c7305 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 03:38:24 +0000 Subject: [PATCH 1/2] jdupes: 1.17.0 -> 1.18.2 --- pkgs/tools/misc/jdupes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index e30a5e62286..74ccb55240a 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.17.0"; + version = "1.18.2"; src = fetchFromGitHub { owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "1c81xcjzfp4fd2zbq3jbknkqlrn0l5wkr08sgvcsxxvqa80338xv"; + sha256 = "1gaqdcz0s31qncar9dzlr8izv50zlk4y6dgdm9xjk6as2g8b0fkk"; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. From b87268ff2ebe94a559463c3b3a12258bfbf564bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 4 Aug 2020 09:25:48 +0200 Subject: [PATCH 2/2] jdupes: fix build on Darwin jdupes was compiled with HARDEN=1. This adds the '-z' option to `ld`, which is not available LLVM ld. Only enable the HARDEN option for GNU toolchains. --- pkgs/tools/misc/jdupes/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix index 74ccb55240a..7d559a1468e 100644 --- a/pkgs/tools/misc/jdupes/default.nix +++ b/pkgs/tools/misc/jdupes/default.nix @@ -19,10 +19,11 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" - "HARDEN=1" ] ++ stdenv.lib.optionals stdenv.isLinux [ "ENABLE_DEDUPE=1" "STATIC_DEDUPE_H=1" + ] ++ stdenv.lib.optionals stdenv.cc.isGNU [ + "HARDEN=1" ]; enableParallelBuilding = true;