diff options
| author | figsoda <figsoda@pm.me> | 2021-09-16 09:15:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-16 09:15:33 -0400 |
| commit | d650c9a0f64506e8f3eaeadfe9c9ac1e8eb90608 (patch) | |
| tree | 4c3968ce086958fd1bbb941761f6ba937704400c | |
| parent | acf4523f125c798162b57494acdd6ba95b1d49e5 (diff) | |
| parent | eeae23051f4f5600b1da9b19949fc0dc5b9f821e (diff) | |
| download | nixpkgs-d650c9a0f64506e8f3eaeadfe9c9ac1e8eb90608.tar nixpkgs-d650c9a0f64506e8f3eaeadfe9c9ac1e8eb90608.tar.gz nixpkgs-d650c9a0f64506e8f3eaeadfe9c9ac1e8eb90608.tar.bz2 nixpkgs-d650c9a0f64506e8f3eaeadfe9c9ac1e8eb90608.tar.lz nixpkgs-d650c9a0f64506e8f3eaeadfe9c9ac1e8eb90608.tar.xz nixpkgs-d650c9a0f64506e8f3eaeadfe9c9ac1e8eb90608.tar.zst nixpkgs-d650c9a0f64506e8f3eaeadfe9c9ac1e8eb90608.zip | |
Merge pull request #137626 from msfjarvis/hs/2021-09-12/fclones-darwin
fclones: add Darwin support, bump 0.14.0 -> 0.15.0
| -rw-r--r-- | pkgs/tools/misc/fclones/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 19 insertions, 11 deletions
diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 1072bbcc5da..14ade9ce32b 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -1,29 +1,35 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, udev }: +{ lib, stdenv +, fetchFromGitHub +, libiconv +, rustPlatform +, AppKit +}: 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 ]; + 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"; homepage = "https://github.com/pkolaczk/fclones"; license = licenses.mit; - maintainers = with maintainers; [ cyounkins ]; + maintainers = with maintainers; [ cyounkins msfjarvis ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3299699293..01c95508723 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24311,7 +24311,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 { }; |