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

Merge remote-tracking branch 'upstream/master' into staging

Browse Source 
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
This commit is contained in:
Tuomas Tynkkynen
2018-02-28 20:52:49 +02:00
parent ad17db3562 f1dd205c4e
commit 34f95d92a2
261 changed files with 3045 additions and 2049 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/pew/default.nix
View File

@@ -6,7 +6,7 @@ with python3Packages; buildPythonApplication rec {
src = fetchPypi {
inherit pname version;
sha256 = "b8312728526c9010295c88215c95a1b1731fdbd1a568f728e069932bd0545611";
sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq";
};
propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ];
@@ -29,4 +29,4 @@ with python3Packages; buildPythonApplication rec {
platforms = platforms.all;
maintainers = with maintainers; [ berdario ];
};
}
}