aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/misc/trash-cli/default.nix')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/tools/misc/trash-cli/default.nix28
1 files changed, 4 insertions, 24 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/misc/trash-cli/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
index 141cceff24d3..fce992acd31d 100644
--- a/infra/libkookie/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/tools/misc/trash-cli/default.nix
@@ -1,37 +1,17 @@
-{ stdenv, fetchFromGitHub, fetchpatch, coreutils
-, python3Packages, substituteAll }:
+{ stdenv, fetchFromGitHub, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "trash-cli";
- version = "0.17.1.14";
+ version = "0.20.11.23";
src = fetchFromGitHub {
owner = "andreafrancia";
repo = "trash-cli";
rev = version;
- sha256 = "1bqazna223ibqjwbc1wfvfnspfyrvjy8347qlrgv4cpng72n7gfi";
+ sha256 = "1fjkmpnbpzxniypql68cpwc2rrnih8b34p8pzabrf55f49wcmcph";
};
- patches = [
- (substituteAll {
- src = ./nix-paths.patch;
- df = "${coreutils}/bin/df";
- 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";
- })
- ];
+ propagatedBuildInputs = [ python3Packages.psutil ];
checkInputs = with python3Packages; [
nose