diff options
author | figsoda <figsoda@pm.me> | 2023-02-26 00:14:15 -0500 |
---|---|---|
committer | figsoda <figsoda@pm.me> | 2023-02-26 00:14:15 -0500 |
commit | 3a0b1aff7a8e98c7e8fccd99f0bd431c39dff300 (patch) | |
tree | b661a7dcd1c98dc75781d4100901138ea8afa769 /pkgs/tools/misc/trashy | |
parent | dd3537583d515078459b0414705d7187b069cd7b (diff) |
trashy: remove patch, clean up
Diffstat (limited to 'pkgs/tools/misc/trashy')
-rw-r--r-- | pkgs/tools/misc/trashy/default.nix | 20 | ||||
-rw-r--r-- | pkgs/tools/misc/trashy/lock-version.patch | 13 |
2 files changed, 8 insertions, 25 deletions
diff --git a/pkgs/tools/misc/trashy/default.nix b/pkgs/tools/misc/trashy/default.nix index fb42a886fee52..edaf1893f3265 100644 --- a/pkgs/tools/misc/trashy/default.nix +++ b/pkgs/tools/misc/trashy/default.nix @@ -1,21 +1,15 @@ -{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, rustPlatform, fetchCrate, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "trashy"; version = "2.0.0"; - src = fetchFromGitHub { - owner = "oberblastmeister"; - repo = "trashy"; - rev = "v${version}"; - sha256 = "sha256-xYSk0M8oNwbwZbKWDXMQlnt7vKi0p3+2Tr4eXCvtHEM="; + src = fetchCrate { + inherit pname version; + hash = "sha256-1xHyhAV8hpgMngQdamRzEliyG60t+I3KfsDJi0+180o="; }; - 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 ]; + cargoHash = "sha256-ZWqWtWzb+CLH1ravBb/oV+aPxplEyiC1wEFhvchcLqg="; nativeBuildInputs = [ installShellFiles ]; @@ -27,9 +21,11 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A simple, fast, and featureful alternative to rm and trash-cli."; + description = "A simple, fast, and featureful alternative to rm and trash-cli"; homepage = "https://github.com/oberblastmeister/trashy"; + changelog = "https://github.com/oberblastmeister/trashy/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ oberblastmeister ]; + mainProgram = "trash"; }; } diff --git a/pkgs/tools/misc/trashy/lock-version.patch b/pkgs/tools/misc/trashy/lock-version.patch deleted file mode 100644 index 3e95a3fbfddae..0000000000000 --- a/pkgs/tools/misc/trashy/lock-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -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", |