about summary refs log tree commit diff
path: root/pkgs/tools/misc/jdupes/default.nix
diff options
context:
space:
mode:
authorWeijia Wang <9713184+wegank@users.noreply.github.com>2023-01-23 06:53:00 +0100
committerGitHub <noreply@github.com>2023-01-23 06:53:00 +0100
commit290892ddba7468398b6a0bf77ce29b8a00b7cd53 (patch)
tree4e191063f5f0f46baa09573c5e408db43fca3477 /pkgs/tools/misc/jdupes/default.nix
parentcc3771fcb5d27cd510619a8865ae197942d44a0d (diff)
Revert "jdupes: 1.21.0 -> 1.21.1"
Diffstat (limited to 'pkgs/tools/misc/jdupes/default.nix')
-rw-r--r--pkgs/tools/misc/jdupes/default.nix24
1 files changed, 21 insertions, 3 deletions
diff --git a/pkgs/tools/misc/jdupes/default.nix b/pkgs/tools/misc/jdupes/default.nix
index c4d54f38110e5..72970d2dc9b45 100644
--- a/pkgs/tools/misc/jdupes/default.nix
+++ b/pkgs/tools/misc/jdupes/default.nix
@@ -1,20 +1,38 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "jdupes";
-  version = "1.21.1";
+  version = "1.21.0";
 
   src = fetchFromGitHub {
     owner = "jbruchon";
     repo  = "jdupes";
     rev   = "v${version}";
-    sha256 = "sha256-VtwEDw0BBcXO2NVka0pddJSOm8hnQ8iqL2fzGI8uVFM=";
+    sha256 = "sha256-nDyRaV49bLVHlyqKJ7hf6OBWOLCfmHrTeHryK091c3w=";
     # 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.
     postFetch = "rm -r $out/testdir";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "darwin-stack-size.patch";
+      url = "https://github.com/jbruchon/jdupes/commit/8f5b06109b44a9e4316f9445da3044590a6c63e2.patch";
+      sha256 = "0saq92v0mm5g979chr062psvwp3i3z23mgqrcliq4m07lvwc7i3s";
+    })
+    (fetchpatch {
+      name = "linux-header-ioctl.patch";
+      url = "https://github.com/jbruchon/jdupes/commit/0d4d98f51c99999d2c6dbbb89d554af551b5b69b.patch";
+      sha256 = "sha256-lyuZeRp0Laa8I9nDl1HGdlKa59OvGRQJnRg2fTWv7mQ=";
+    })
+    (fetchpatch {
+      name = "darwin-apfs-comp.patch";
+      url = "https://github.com/jbruchon/jdupes/commit/517b7035945eacd82323392b13bc17b044bcc89d.patch";
+      sha256 = "sha256-lvOab6tyEyKUtik3JBdIs5SHpVjcQEDfN7n2bfUszBw=";
+    })
+  ];
+
   dontConfigure = true;
 
   makeFlags = [