diff options
author | Peter Simons <simons@cryp.to> | 2014-12-23 20:31:19 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-12-23 20:44:49 +0100 |
commit | 83119737597c06844fc47b949af74ca47294c4ed (patch) | |
tree | 42ad33e4c620aafb0cedec78b004d8dd68db9239 | |
parent | 667b97b5c2165e55c8e4645c735f3a604b8d557d (diff) | |
download | nixlib-83119737597c06844fc47b949af74ca47294c4ed.tar nixlib-83119737597c06844fc47b949af74ca47294c4ed.tar.gz nixlib-83119737597c06844fc47b949af74ca47294c4ed.tar.bz2 nixlib-83119737597c06844fc47b949af74ca47294c4ed.tar.lz nixlib-83119737597c06844fc47b949af74ca47294c4ed.tar.xz nixlib-83119737597c06844fc47b949af74ca47294c4ed.tar.zst nixlib-83119737597c06844fc47b949af74ca47294c4ed.zip |
Add GHC 7.8.4 and create haskellPackages_ghc784 package set.
-rw-r--r-- | pkgs/development/compilers/ghc/7.8.4.nix | 44 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 7 |
3 files changed, 52 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix new file mode 100644 index 000000000000..ccc3f4c875ba --- /dev/null +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: + +stdenv.mkDerivation rec { + version = "7.8.4"; + name = "ghc-${version}"; + + src = fetchurl { + url = "http://www.haskell.org/ghc/dist/7.8.4/${name}-src.tar.xz"; + sha256 = "1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3"; + }; + + buildInputs = [ ghc perl gmp ncurses ]; + + enableParallelBuilding = true; + + buildMK = '' + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" + libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" + DYNAMIC_BY_DEFAULT = NO + ''; + + preConfigure = '' + echo "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + ''; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" "--keep-file-symbols" ]; + + meta = with stdenv.lib; { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = [ maintainers.marcweber maintainers.andres maintainers.simons ]; + inherit (ghc.meta) license; + # Filter old "i686-darwin" platform which is unsupported these days. + platforms = filter (x: elem x platforms.all) ghc.meta.platforms; + # Disable Darwin builds: <https://github.com/NixOS/nixpkgs/issues/2689>. + hydraPlatforms = filter (x: !elem x platforms.darwin) meta.platforms; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f7b1d094629..f8235701f6f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3363,6 +3363,7 @@ let haskellPackages_ghc783_no_profiling = recurseIntoAttrs haskell.packages_ghc783.noProfiling; haskellPackages_ghc783_profiling = recurseIntoAttrs haskell.packages_ghc783.profiling; haskellPackages_ghc783 = recurseIntoAttrs haskell.packages_ghc783.highPrio; + haskellPackages_ghc784 = haskell.packages_ghc784; haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; haxe = callPackage ../development/compilers/haxe { }; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 4e3746d4de6e..1b1ee488cc93 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -232,6 +232,13 @@ prefFun = ghc783Prefs; }; + + packages_ghc784 = + packages { ghcPath = ../development/compilers/ghc/7.8.4.nix; + ghcBinary = if stdenv.isDarwin then ghc783Binary else ghc742Binary; + prefFun = ghc783Prefs; + }; + packages_ghc763 = packages { ghcPath = ../development/compilers/ghc/7.6.3.nix; ghcBinary = ghc704Binary; |