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

Merge remote-tracking branch 'origin/master' into multiple-outputs

Browse Source 
Conflicts:
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/gmime/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/servers/x11/xorg/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Eelco Dolstra
2013-06-25 18:42:56 +02:00
parent cc61d31902 9dc3599960
commit 552fd3d599
438 changed files with 11405 additions and 3550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@
curl = ./curl.bz2;
bootstrapTools = {
url = "http://nixos.org/tarballs/stdenv-linux/armv5tel/r18744/bootstrap-tools.cpio.bz2";
url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/r18744/bootstrap-tools.cpio.bz2";
sha256 = "1rn4n5kilqmv62dfjfcscbsm0w329k3gyb2v9155fsi1sl2cfzcb";
};
}
pkgs/stdenv/linux/bootstrap/i686/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@
curl = ./curl.bz2;
bootstrapTools = {
url = http://nixos.org/tarballs/stdenv-linux/i686/r24519/bootstrap-tools.cpio.bz2;
url = http://tarballs.nixos.org/stdenv-linux/i686/r24519/bootstrap-tools.cpio.bz2;
sha256 = "0imypaxy6piwbk8ff2y1nr7yk49pqmdgdbv6g8miq1zs5yfip6ij";
};
}
pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
+1 -1
View File
@@ -7,7 +7,7 @@
curl = ./curl.bz2;
bootstrapTools = {
url = "http://nixos.org/tarballs/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2";
url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2";
sha256 = "00aavbk76qjj2gdlmpaaj66r8nzl4d7pyl8cv1gigyzgpbr5vv3j";
};
}
pkgs/stdenv/linux/bootstrap/powerpc/default.nix
+4 -4
View File
@@ -6,22 +6,22 @@
tar = ./tar.bz2;
staticToolsURL = {
url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/static-tools.tar.bz2;
url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/static-tools.tar.bz2;
sha1 = "e4d1680e3dfa752e49a996a31140db53b10061cb";
};
binutilsURL = {
url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/binutils.tar.bz2;
url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/binutils.tar.bz2;
sha1 = "2609f4d9277a60fcd178395d3d49911190e08f36";
};
gccURL = {
url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/gcc.tar.bz2;
url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/gcc.tar.bz2;
sha1 = "71d79d736bfef6252208fe6239e528a591becbed";
};
glibcURL = {
url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/glibc.tar.bz2;
url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/glibc.tar.bz2;
sha1 = "bf0245e16235800c8aa9c6a5de6565583a66e46d";
};
}
pkgs/stdenv/linux/bootstrap/x86_64/default.nix
+1 -1
View File
@@ -4,7 +4,7 @@
{
bootstrapTools = {
url = http://nixos.org/tarballs/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2;
url = http://tarballs.nixos.org/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2;
sha256 = "0w89kqhx47yl0jifp2vffp073pyrqha5f312kp971smi4h41drna";
};
}