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

Merge branch 'master' into staging

Browse Source 
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
This commit is contained in:
Luca Bruno
2014-11-08 15:56:40 +01:00
parent 7f3c95e6b7 aa2fd47e9d
commit 83221f3886
129 changed files with 1760 additions and 814 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/head.nix
+3 -3
View File
@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }:
stdenv.mkDerivation rec {
version = "7.9.20140814";
version = "7.9.20141106";
name = "ghc-${version}";
src = fetchurl {
url = "http://deb.haskell.org/dailies/2014-08-14/ghc_${version}.orig.tar.bz2";
sha256 = "05vmlbzbfv72z570xmlh8n003z9xc4l5hixjqvczyyyisdvmyaa3";
url = "http://deb.haskell.org/dailies/2014-11-06/ghc_${version}.orig.tar.bz2";
sha256 = "1si8wx8a2lrg5ba13vwpisssxa3rcxi5a7fqxhgapa8d2i2w7gaz";
};
buildInputs = [ ghc perl gmp ncurses happy alex ];