diff --git a/pkgs/tools/misc/trashy/default.nix b/pkgs/tools/misc/trashy/default.nix index 7d3b3952a7ca..fb42a886fee5 100644 --- a/pkgs/tools/misc/trashy/default.nix +++ b/pkgs/tools/misc/trashy/default.nix @@ -2,16 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "trashy"; - version = "1.0.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "oberblastmeister"; repo = "trashy"; rev = "v${version}"; - sha256 = "sha256-b50Q7knJzXKDfM1kw6wLvXunhgOXVs+zYvZx/NYqMdk="; + sha256 = "sha256-xYSk0M8oNwbwZbKWDXMQlnt7vKi0p3+2Tr4eXCvtHEM="; }; - cargoSha256 = "sha256-2hNNLXuAHd1bquhHimniqryTVMfBmPAOossggICScqQ="; + cargoSha256 = "sha256-ZWqWtWzb+CLH1ravBb/oV+aPxplEyiC1wEFhvchcLqg="; + + # this patch must be removed after oberblastmeister/trashy#70 is solved or new + # version is released. + cargoPatches = [ ./lock-version.patch ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/trashy/lock-version.patch b/pkgs/tools/misc/trashy/lock-version.patch new file mode 100644 index 000000000000..3e95a3fbfdda --- /dev/null +++ b/pkgs/tools/misc/trashy/lock-version.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 7af0268..dc197a0 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -889,7 +889,7 @@ dependencies = [ + + [[package]] + name = "trashy" +-version = "1.0.3" ++version = "2.0.0" + dependencies = [ + "aho-corasick", + "ansi_term",