public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into closure-size

Browse Source 
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
This commit is contained in:
Vladimír Čunát
2016-03-08 09:58:19 +01:00
parent f306e67e15 0ee75214f3
commit 09af15654f
1276 changed files with 78548 additions and 29166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/misc/trash-cli/default.nix
+1 -1
View File
@@ -2,7 +2,7 @@
assert stdenv.isLinux;
python2Packages.buildPythonPackage rec {
python2Packages.buildPythonApplication rec {
name = "trash-cli-${version}";
version = "0.12.9.14";
namePrefix = "";