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

Merge branch master into x-updates

Browse Source 
Conflicts (not used, deleted):
	pkgs/desktops/xfce/common.nix
This commit is contained in:
Vladimír Čunát
2013-11-23 10:22:26 +01:00
parent 0d4d1097cb a7675b2aae
commit b5fba47147
98 changed files with 2198 additions and 531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/buildout-nix/default.nix
View File

@@ -1,11 +1,11 @@
{ fetchurl, stdenv, buildPythonPackage }:
buildPythonPackage {
name = "zc.buildout-nix-2.2.0";
name = "zc.buildout-nix-2.2.1";
src = fetchurl {
url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.2.0.tar.gz";
md5 = "771dd9807da7d5ef5bb998991c5fdae1";
url = "https://pypi.python.org/packages/source/z/zc.buildout/zc.buildout-2.2.1.tar.gz";
md5 = "476a06eed08506925c700109119b6e41";
};
patches = [ ./nix.patch ];