trashy: remove patch, clean up

This commit is contained in:
figsoda 2023-02-26 00:14:15 -05:00
parent dd3537583d
commit 3a0b1aff7a
2 changed files with 8 additions and 25 deletions

View file

@ -1,21 +1,15 @@
{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: { lib, rustPlatform, fetchCrate, installShellFiles }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "trashy"; pname = "trashy";
version = "2.0.0"; version = "2.0.0";
src = fetchFromGitHub { src = fetchCrate {
owner = "oberblastmeister"; inherit pname version;
repo = "trashy"; hash = "sha256-1xHyhAV8hpgMngQdamRzEliyG60t+I3KfsDJi0+180o=";
rev = "v${version}";
sha256 = "sha256-xYSk0M8oNwbwZbKWDXMQlnt7vKi0p3+2Tr4eXCvtHEM=";
}; };
cargoSha256 = "sha256-ZWqWtWzb+CLH1ravBb/oV+aPxplEyiC1wEFhvchcLqg="; cargoHash = "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 ]; nativeBuildInputs = [ installShellFiles ];
@ -27,9 +21,11 @@ rustPlatform.buildRustPackage rec {
''; '';
meta = with lib; { 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"; homepage = "https://github.com/oberblastmeister/trashy";
changelog = "https://github.com/oberblastmeister/trashy/blob/v${version}/CHANGELOG.md";
license = with licenses; [ asl20 /* or */ mit ]; license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ oberblastmeister ]; maintainers = with maintainers; [ oberblastmeister ];
mainProgram = "trash";
}; };
} }

View file

@ -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",