diff options
author | Peter Simons <simons@cryp.to> | 2017-01-03 14:40:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-03 14:40:18 +0100 |
commit | 494d695b97c276325de867260b156ee4a7a709f7 (patch) | |
tree | e31a41a7ca5d0e9d74032ab5999c4157cd569a2f /pkgs/development/compilers/ghc | |
parent | 85ff5a2583a893b928e5471d5716658306ab9daf (diff) | |
parent | 9f7c7405fbafb24e82028e602242bcc7aecc660b (diff) | |
download | nixlib-494d695b97c276325de867260b156ee4a7a709f7.tar nixlib-494d695b97c276325de867260b156ee4a7a709f7.tar.gz nixlib-494d695b97c276325de867260b156ee4a7a709f7.tar.bz2 nixlib-494d695b97c276325de867260b156ee4a7a709f7.tar.lz nixlib-494d695b97c276325de867260b156ee4a7a709f7.tar.xz nixlib-494d695b97c276325de867260b156ee4a7a709f7.tar.zst nixlib-494d695b97c276325de867260b156ee4a7a709f7.zip |
Merge pull request #21393 from mpickering/master
Small improvements to development GHC derivations
Diffstat (limited to 'pkgs/development/compilers/ghc')
-rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 21 | ||||
-rw-r--r-- | pkgs/development/compilers/ghc/nokinds.nix | 83 |
2 files changed, 11 insertions, 93 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 7573451695c3..0581038d18df 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,13 +1,13 @@ { stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, autoconf, automake, happy, alex, crossSystem, selfPkgs, cross ? null +, autoconf, automake, happy, alex, python3, crossSystem, selfPkgs, cross ? null }: let inherit (bootPkgs) ghc; - commonBuildInputs = [ ghc perl autoconf automake happy alex ]; + commonBuildInputs = [ ghc perl autoconf automake happy alex python3 ]; - version = "8.1.20161115"; + version = "8.1.20161224"; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure @@ -19,27 +19,26 @@ let in stdenv.mkDerivation (rec { inherit version; name = "ghc-${version}"; - rev = "017d11e0a36866b05ace32ece1af11adf652a619"; + rev = "2689a1692636521777f007861a484e7064b2d696"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y"; + sha256 = "0rk6xy7kgxx849nprq1ji459p88nyy93236g841m5p6mdh7mmrcr"; }; - postPatch = '' + postPatch = "patchShebangs ."; + + preConfigure = '' echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID - patchShebangs . ./boot - ''; + '' + commonPreConfigure ; buildInputs = commonBuildInputs; enableParallelBuilding = true; - preConfigure = commonPreConfigure; - configureFlags = [ "CC=${stdenv.cc}/bin/cc" "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" @@ -52,6 +51,8 @@ in stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; + checkTarget = "test"; + postInstall = '' paxmark m $out/lib/${name}/bin/{ghc,haddock} diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix deleted file mode 100644 index a041ff02f936..000000000000 --- a/pkgs/development/compilers/ghc/nokinds.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }: - -let - inherit (bootPkgs) ghc; - - buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include" - libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib" - DYNAMIC_BY_DEFAULT = NO - SRC_HC_OPTS = -H64m -O -fasm - GhcLibHcOpts = -O -dcore-lint - GhcStage1HcOpts = -Rghc-timing -O -fasm - GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG - SplitObjs = NO - HADDOCK_DOCS = NO - BUILD_DOCBOOK_HTML = NO - BUILD_DOCBOOK_PS = NO - BUILD_DOCBOOK_PDF = NO - LAX_DEPENDENCIES = YES - ${stdenv.lib.optionalString stdenv.isDarwin '' - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include" - libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib" - ''} - ''; - -in - -stdenv.mkDerivation rec { - version = "7.11.20150826"; - name = "ghc-${version}"; # We cannot add a "nokinds" tag here; see git comment for details. - rev = "5f7f64b7fc879b5ecfd6987ec5565bd90f7c0179"; - - src = fetchgit { - url = "https://github.com/goldfirere/ghc.git"; - inherit rev; - sha256 = "183l4v6aw52r3ydwl8bxg1lh3cwfakb35rpy6mjg23dqmqsynmcn"; - }; - - patches = [ ./relocation.patch ]; - - postUnpack = '' - pushd ghc-${builtins.substring 0 7 rev} - echo ${version} >VERSION - echo ${rev} >GIT_COMMIT_ID - patchShebangs . - ./boot - popd - ''; - - buildInputs = [ ghc perl autoconf automake happy alex ]; - - preConfigure = '' - echo >mk/build.mk "${buildMK}" - 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}" - ''; - - configureFlags = [ - "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ]; - - enableParallelBuilding = true; - - # 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"; - - passthru = { - inherit bootPkgs; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "The dependently-typed 'nokinds' branch of the Glasgow Haskell Compiler by Richard Eisenberg"; - maintainers = with stdenv.lib.maintainers; [ deepfire ]; - inherit (ghc.meta) license platforms; - }; - -} |