Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 413237b4edca
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a887211a5ebc
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 11, 2020

  1. trash-cli: 0.17.1.14 -> 0.20.11.7

    @rycee
    rycee committed Nov 11, 2020
    Copy the full SHA
    14a6cf2 View commit details

  2. Merge pull request #103486 from rycee/bump/trash-cli 

    trash-cli: 0.17.1.14 -> 0.20.11.7
    @Ma27
    Ma27 authored Nov 11, 2020
    Copy the full SHA
    a887211 View commit details
Showing with 2 additions and 14 deletions.
  1. +2 −14 pkgs/tools/misc/trash-cli/default.nix
16 changes: 2 additions & 14 deletions pkgs/tools/misc/trash-cli/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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; [