From 157e63c6e6d7f9021eebc604370888642e05c84d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 23 Dec 2014 22:49:30 +0100 Subject: Update default Haskell compiler from GHC 7.8.3 to 7.8.4. --- pkgs/development/compilers/ghc/7.8.3.nix | 44 -------------------------------- pkgs/top-level/all-packages.nix | 11 ++++---- pkgs/top-level/haskell-defaults.nix | 13 +++------- 3 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/7.8.3.nix (limited to 'pkgs') diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix deleted file mode 100644 index 9f5fc4b4e50d..000000000000 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: - -stdenv.mkDerivation rec { - version = "7.8.3"; - name = "ghc-${version}"; - - src = fetchurl { - url = "http://www.haskell.org/ghc/dist/7.8.3/${name}-src.tar.xz"; - sha256 = "0n5rhwl83yv8qm0zrbaxnyrf8x1i3b6si927518mwfxs96jrdkdh"; - }; - - 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: . - 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 663fa14d076a..9904eebef268 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3352,7 +3352,7 @@ let builtins.substring 0 (builtins.stringLength "packages_") name == "packages_" ) haskell)); - haskellPackages = haskellPackages_ghc783; + haskellPackages = haskellPackages_ghc784; haskellPackages_ghc6104 = haskell.packages_ghc6104; haskellPackages_ghc6123 = haskell.packages_ghc6123; @@ -3360,10 +3360,9 @@ let haskellPackages_ghc722 = haskell.packages_ghc722; haskellPackages_ghc742 = haskell.packages_ghc742; haskellPackages_ghc763 = haskell.packages_ghc763; - 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_ghc784_no_profiling = recurseIntoAttrs haskell.packages_ghc784.noProfiling; + haskellPackages_ghc784_profiling = recurseIntoAttrs haskell.packages_ghc784.profiling; + haskellPackages_ghc784 = recurseIntoAttrs haskell.packages_ghc784.highPrio; haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; haxe = callPackage ../development/compilers/haxe { }; @@ -9313,7 +9312,7 @@ let d4x = callPackage ../applications/misc/d4x { }; - darcs = with haskellPackages_ghc783; callPackage ../applications/version-management/darcs { + darcs = with haskellPackages_ghc784; callPackage ../applications/version-management/darcs { cabal = cabal.override { extension = self : super : { enableSharedExecutables = false; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 1b1ee488cc93..6077c03b800e 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -19,7 +19,7 @@ mtl = self.mtl_2_2_1; }; - ghc783Prefs = self : super : ghcHEADPrefs self super // { + ghc784Prefs = self : super : ghcHEADPrefs self super // { cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = self.Cabal_1_20_0_2; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_2; }; @@ -30,7 +30,7 @@ }; }; }; - ghc763Prefs = self : super : ghc783Prefs self super // { + ghc763Prefs = self : super : ghc784Prefs self super // { aeson = self.aeson_0_7_0_4; ariadne = super.ariadne.override { haskellNames = self.haskellNames.override { @@ -226,17 +226,10 @@ }; }; - packages_ghc783 = - packages { ghcPath = ../development/compilers/ghc/7.8.3.nix; - ghcBinary = if stdenv.isDarwin then ghc783Binary else ghc742Binary; - prefFun = ghc783Prefs; - }; - - packages_ghc784 = packages { ghcPath = ../development/compilers/ghc/7.8.4.nix; ghcBinary = if stdenv.isDarwin then ghc783Binary else ghc742Binary; - prefFun = ghc783Prefs; + prefFun = ghc784Prefs; }; packages_ghc763 = -- cgit 1.4.1