From b6d412f1021775caffb5e3e55dc9ec4e63866574 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Mon, 13 Sep 2021 13:27:29 +0530
Subject: fclones: 0.14.0 -> 0.15.0

---
 pkgs/tools/misc/fclones/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix
index 1072bbcc5da..13cdb92a41e 100644
--- a/pkgs/tools/misc/fclones/default.nix
+++ b/pkgs/tools/misc/fclones/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fclones";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "pkolaczk";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1ni5amy903cy822yhw070bcrrixrw2m1vr66q1h32bc98pyv4w05";
+    sha256 = "sha256-8NUneKJpnBjC4OcAABEpI9p+saBqAk+l43FS8/tIYjc=";
   };
 
-  cargoSha256 = "1gcb46k7bwdfsf6hyvmi6dna1nf6myzy63bhjfp0wy7c8g4m2mg8";
+  cargoSha256 = "sha256-5qX45FJFaiE1vTXjllM9U1w57MX18GgKEFOEBMc64Jk=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ udev ];
-- 
cgit 1.4.1


From b2ec5cb0bd283c0521515f8d8b36a6e97eee2bc4 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 11 Sep 2021 03:43:40 +0530
Subject: fclones: add support for Darwin builds

---
 pkgs/tools/misc/fclones/default.nix | 18 ++++++++++++------
 pkgs/top-level/all-packages.nix     |  4 +++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix
index 13cdb92a41e..01bab289413 100644
--- a/pkgs/tools/misc/fclones/default.nix
+++ b/pkgs/tools/misc/fclones/default.nix
@@ -1,4 +1,9 @@
-{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, udev }:
+{ lib, stdenv
+, fetchFromGitHub
+, libiconv
+, rustPlatform
+, AppKit
+}:
 
 rustPlatform.buildRustPackage rec {
   pname = "fclones";
@@ -13,12 +18,13 @@ rustPlatform.buildRustPackage rec {
 
   cargoSha256 = "sha256-5qX45FJFaiE1vTXjllM9U1w57MX18GgKEFOEBMc64Jk=";
 
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ udev ];
+  buildInputs = lib.optionals stdenv.isDarwin [
+    AppKit
+    libiconv
+  ];
 
-  # tests in dedupe.rs fail due to
-  # "creation time is not available for the filesystem"
-  doCheck = false;
+  # device::test_physical_device_name test fails on Darwin
+  doCheck = !stdenv.isDarwin;
 
   meta = with lib; {
     description = "Efficient Duplicate File Finder and Remover";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 424046b942b..0de51623f6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -24738,7 +24738,9 @@ with pkgs;
 
   fbida = callPackage ../applications/graphics/fbida { };
 
-  fclones = callPackage ../tools/misc/fclones { };
+  fclones = callPackage ../tools/misc/fclones {
+    inherit (darwin.apple_sdk.frameworks) AppKit;
+  };
 
   fcp = callPackage ../tools/misc/fcp { };
 
-- 
cgit 1.4.1


From eeae23051f4f5600b1da9b19949fc0dc5b9f821e Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Sat, 11 Sep 2021 03:43:54 +0530
Subject: fclones: add msfjarvis as maintainer

---
 pkgs/tools/misc/fclones/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix
index 01bab289413..14ade9ce32b 100644
--- a/pkgs/tools/misc/fclones/default.nix
+++ b/pkgs/tools/misc/fclones/default.nix
@@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec {
     description = "Efficient Duplicate File Finder and Remover";
     homepage = "https://github.com/pkolaczk/fclones";
     license = licenses.mit;
-    maintainers = with maintainers; [ cyounkins ];
+    maintainers = with maintainers; [ cyounkins msfjarvis ];
   };
 }
-- 
cgit 1.4.1