diff options
author | Alyssa Ross <hi@alyssa.is> | 2019-12-29 21:29:34 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2019-12-29 21:29:34 +0000 |
commit | 1acfa8ff79fd8895ebc7ca9954830ace0577fff2 (patch) | |
tree | 25f168400b9192ca94a7bdb0bb19ce11f03db509 /pkgs/tools/misc/trash-cli/default.nix | |
parent | 82bd3b0cbfb0af1555ed5b6b6f4edf2b6b17a144 (diff) | |
parent | be90b35b9efbd7baaa80f367ffc41609531a8fe2 (diff) | |
download | nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.gz nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.bz2 nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.lz nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.xz nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.tar.zst nixpkgs-1acfa8ff79fd8895ebc7ca9954830ace0577fff2.zip |
Merge remote-tracking branch 'nixpkgs/master' into spectrum
Diffstat (limited to 'pkgs/tools/misc/trash-cli/default.nix')
-rw-r--r-- | pkgs/tools/misc/trash-cli/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index fd818ca6f9b..ac8feaef275 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -26,6 +26,12 @@ python3Packages.buildPythonApplication rec { 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; [ |