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

Merge remote-tracking branch 'eelco/master' into stdenv-updates

Browse Source 
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
This commit is contained in:
Lluís Batlle i Rossell
2012-12-28 23:28:16 +01:00
parent 88b11196c1 fde74242bf
commit b58780c43d
135 changed files with 1945 additions and 727 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/recursive-pth-loader/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, python }:
stdenv.mkDerivation rec {
name = "resursive-pth-loader-1.0";
name = "python-recursive-pth-loader-1.0";
unpackPhase = "true";