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

Merge master into stdenv-updates

Browse Source 
Conflicts (simple):
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/tools/package-management/disnix/default.nix
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát
2013-07-08 10:48:05 +02:00
parent 5be89ac733 5d8c682f4e
commit 8ba92b8895
304 changed files with 7116 additions and 1620 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/6.4.2-binary.nix
+1 -1
View File
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
src =
if stdenv.system == "i686-linux" then
fetchurl {
url = http://nixos.org/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2;
url = http://tarballs.nixos.org/ghc-6.4.2-i386-unknown-linux.tar.bz2;
md5 = "092fe2e25dab22b926babe97cc77db1f";
}
else if stdenv.system == "x86_64-linux" then