From 398b36431d6f08b4b9902a8e2d2d4eb0bd34e435 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 10 Sep 2017 09:46:26 +0200 Subject: [PATCH] ghc: remove obsolete 8.0.1 version --- pkgs/development/compilers/ghc/8.0.1.nix | 91 ------------------------ pkgs/top-level/haskell-packages.nix | 9 --- 2 files changed, 100 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/8.0.1.nix diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix deleted file mode 100644 index 6e47ee92630a..000000000000 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils -, hscolour, patchutils, sphinx - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -let - inherit (bootPkgs) ghc; - - fetchFilteredPatch = args: fetchurl (args // { - downloadToTemp = true; - postFetch = '' - ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" - ''; - }); -in -stdenv.mkDerivation rec { - version = "8.0.1"; - name = "ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.1/${name}-src.tar.xz"; - sha256 = "1lniqy29djhjkddnailpaqhlqh4ld2mqvb1fxgxw1qqjhz6j1ywh"; - }; - - patches = [ - ./relocation.patch - - # Fix https://ghc.haskell.org/trac/ghc/ticket/12130 - (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; }) - (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) - ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; - - buildInputs = [ ghc perl hscolour sphinx]; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - preConfigure = '' - 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}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString enableIntegerSimple '' - echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk - ''; - - configureFlags = [ - "--with-gcc=${stdenv.cc}/bin/cc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - "--datadir=$doc/share/doc/ghc" - ] ++ stdenv.lib.optional (! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional stdenv.isDarwin [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ]; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} - - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 09e3835712fe..b3bbb0d5b643 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -66,11 +66,6 @@ in rec { bootPkgs = packages.ghc784; inherit (bootPkgs) hscolour; }; - ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix rec { - bootPkgs = packages.ghc7103; - inherit (bootPkgs) hscolour; - sphinx = pkgs.python27Packages.sphinx; - }; ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) hscolour; @@ -163,10 +158,6 @@ in rec { ghc = compiler.ghc7103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; - ghc801 = callPackage ../development/haskell-modules { - ghc = compiler.ghc801; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; - }; ghc802 = callPackage ../development/haskell-modules { ghc = compiler.ghc802; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { };