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

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

Browse Source
This commit is contained in:
Eelco Dolstra
2014-07-14 17:04:55 +02:00
parent 0b82b95322 b57bc220cc
commit ff97b7dbe6
1429 changed files with 4283 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/buildenv/default.nix
View File

@@ -23,10 +23,12 @@
, # Shell command to run after building the symlink tree.
postBuild ? ""
, passthru ? {}
}:
runCommand name
{ inherit manifest paths ignoreCollisions pathsToLink postBuild;
{ inherit manifest paths ignoreCollisions passthru pathsToLink postBuild;
preferLocalBuild = true;
}
''

2
pkgs/build-support/cabal/default.nix
View File

@@ -29,7 +29,7 @@ assert enableSharedExecutables -> versionOlder "7.4" ghc.version;
# Our GHC 6.10.x builds do not provide sharable versions of their core libraries.
assert enableSharedLibraries -> versionOlder "6.12" ghc.version;
# Our GHC 6.10.x builds do not provide sharable versions of their core libraries.
# Pure shared library builds don't work before GHC 7.8.x.
assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
{

3
pkgs/build-support/fetchurl/mirrors.nix
View File

@@ -127,7 +127,7 @@ rec {
ftp://mirror.csclub.uwaterloo.ca/nongnu/
ftp://mirror.publicns.net/pub/nongnu/
ftp://savannah.c3sl.ufpr.br/
http://download.savannah.gnu.org/
http://download.savannah.gnu.org/releases/
http://ftp.cc.uoc.gr/mirrors/nongnu.org/
http://ftp.twaren.net/Unix/NonGNU/
http://mirror.csclub.uwaterloo.ca/nongnu/
@@ -305,7 +305,6 @@ rec {
http://dirichlet.mat.puc.cl/
http://ftp.ctex.org/mirrors/CRAN/
http://mirror.bjtu.edu.cn/cran
http://cran.dataguru.cn/
http://mirrors.ustc.edu.cn/CRAN/
http://mirrors.xmu.edu.cn/CRAN/
http://www.laqee.unal.edu.co/CRAN/

12
pkgs/build-support/vm/default.nix
View File

@@ -1582,22 +1582,22 @@ rec {
debian70x86_64 = debian7x86_64;
debian7i386 = {
name = "debian-7.5-wheezy-i386";
fullName = "Debian 7.5 Wheezy (i386)";
name = "debian-7.6-wheezy-i386";
fullName = "Debian 7.6 Wheezy (i386)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
sha256 = "c4896c30c9a483354714d50f19d0779b72a218ce4f817f9ec8554f9664137993";
sha256 = "773ba601513cd7ef1d5192ad8baa795fa050573d82568c577cdf79adade698a3";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;
};
debian7x86_64 = {
name = "debian-7.5-wheezy-amd64";
fullName = "Debian 7.5 Wheezy (amd64)";
name = "debian-7.6-wheezy-amd64";
fullName = "Debian 7.6 Wheezy (amd64)";
packagesList = fetchurl {
url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
sha256 = "f3b78aac7d2bdfc3896fdd2087affd0e16bafbf35945106b196483f5fb303d52";
sha256 = "11a8bd3648d51f51e56c9f5382168cc47267d67ef6a050826e1cd358ed46cc17";
};
urlPrefix = mirror://debian;
packages = commonDebianPackages;