summary refs log tree commit diff
path: root/pkgs/tools/misc/trash-cli
diff options
context:
space:
mode:
authorRobert Helgesson <robert@rycee.net>2020-11-11 18:56:41 +0100
committerRobert Helgesson <robert@rycee.net>2020-11-11 18:56:41 +0100
commit14a6cf25dba1ac87748706e591acc79c08603a91 (patch)
tree1923e1b516a77cb34bbc77b3e5bf82572ff7106b /pkgs/tools/misc/trash-cli
parentd7e7fb7e7d1704a69f45085fa2a314f2bc7de1df (diff)
downloadnixpkgs-14a6cf25dba1ac87748706e591acc79c08603a91.tar
nixpkgs-14a6cf25dba1ac87748706e591acc79c08603a91.tar.gz
nixpkgs-14a6cf25dba1ac87748706e591acc79c08603a91.tar.bz2
nixpkgs-14a6cf25dba1ac87748706e591acc79c08603a91.tar.lz
nixpkgs-14a6cf25dba1ac87748706e591acc79c08603a91.tar.xz
nixpkgs-14a6cf25dba1ac87748706e591acc79c08603a91.tar.zst
nixpkgs-14a6cf25dba1ac87748706e591acc79c08603a91.zip
trash-cli: 0.17.1.14 -> 0.20.11.7
Diffstat (limited to 'pkgs/tools/misc/trash-cli')
-rw-r--r--pkgs/tools/misc/trash-cli/default.nix16
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 141cceff24d..d7354425b7c 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -3,13 +3,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "trash-cli";
-  version = "0.17.1.14";
+  version = "0.20.11.7";
 
   src = fetchFromGitHub {
     owner = "andreafrancia";
     repo = "trash-cli";
     rev = version;
-    sha256 = "1bqazna223ibqjwbc1wfvfnspfyrvjy8347qlrgv4cpng72n7gfi";
+    sha256 = "0083vagy0jkahb5sw1il7r53ggk45zbjwwjsqd76v7ph3v1awf4v";
   };
 
   patches = [
@@ -19,18 +19,6 @@ python3Packages.buildPythonApplication rec {
       libc = let ext = if stdenv.isDarwin then ".dylib" else ".so.6";
              in "${stdenv.cc.libc}/lib/libc${ext}";
     })
-
-    # Fix build on Python 3.6.
-    (fetchpatch {
-      url = "https://github.com/andreafrancia/trash-cli/commit/a21b80d1e69783bb09376c3f60dd2f2a10578805.patch";
-      sha256 = "0w49rjh433sjfc2cl5a9wlbr6kcn9f1qg905qsyv7ay3ar75wvyp";
-    })
-
-    # Fix listing trashed files over mount points, see https://github.com/andreafrancia/trash-cli/issues/95
-    (fetchpatch {
-      url = "https://github.com/andreafrancia/trash-cli/commit/436dfddb4c2932ba3ff696e4732750b7bdc58461.patch";
-      sha256 = "02pkcz7nj67jbnqpw1943nrv95m8xyjvab4j62fa64r73fagm8m4";
-    })
   ];
 
   checkInputs = with python3Packages; [