From 7c25acd6776f2234b807d286ab5c9e9f090ccb31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Sep 2022 14:46:13 +0000 Subject: [PATCH 1/2] fclones: 0.28.0 -> 0.29.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 bbe11102cbbe..119c0df1e9e8 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OOFmyTEiaZnCx15gkoMGooC4qlevKMBS7umawiKVZqE="; + sha256 = "sha256-0R9UB4xW5LYSA3rJIhJkYCEIN3Fn3eQaqZS1OP4kXNg="; }; - cargoSha256 = "sha256-jWYiZ6YNeGtmcHgqCgC8A7dEdJ29n3W/RdE0wQbOUOA="; + cargoSha256 = "sha256-elpMupN5Ah40+kWzXYDg+PUs0taOxdVhiPMO749H9fA="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit From 6a07ce71b6830a5fe0b6574bd23e0cc6151689d9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 26 Sep 2022 17:17:53 -0400 Subject: [PATCH 2/2] fclones: skip flaky test --- pkgs/tools/misc/fclones/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/fclones/default.nix b/pkgs/tools/misc/fclones/default.nix index 119c0df1e9e8..29479cdce9eb 100644 --- a/pkgs/tools/misc/fclones/default.nix +++ b/pkgs/tools/misc/fclones/default.nix @@ -27,6 +27,11 @@ rustPlatform.buildRustPackage rec { # device::test_physical_device_name test fails on Darwin doCheck = !stdenv.isDarwin; + checkFlags = [ + # ofborg sometimes fails with "Resource temporarily unavailable" + "--skip=cache::test::return_none_if_different_transform_was_used" + ]; + meta = with lib; { description = "Efficient Duplicate File Finder and Remover"; homepage = "https://github.com/pkolaczk/fclones";