diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0df66b59f80..f4ad352d9ea 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -723,11 +723,13 @@ rec { readline = readline4; }; + /* ghcWrapper = assert uulib.ghc == ghc; import ../development/compilers/ghc-wrapper { inherit stdenv ghc; libraries = []; }; + */ helium = import ../development/compilers/helium { inherit fetchurl stdenv ghc; @@ -1820,11 +1822,11 @@ rec { ### DEVELOPMENT / LIBRARIES / HASKELL - uulib = import ../development/libraries/haskell/uulib { + uulib64 = import ../development/libraries/haskell/uulib { # !!! remove? inherit stdenv fetchurl ghc; }; - uulib66 = import ../development/libraries/haskell/uulib-ghc-6.6 { + uulib66 = import ../development/libraries/haskell/uulib-ghc-6.6 { # !!! ugh inherit stdenv fetchurl autoconf; ghc = ghc66; }; diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index efe38d47ebf..b4cd4c8c7f2 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -49,7 +49,7 @@ let { gawk gcc gcc34 - ghcWrapper + ghc ghostscript gnugrep gnum4 @@ -137,7 +137,7 @@ let { unzip upstart utillinux - uulib +# uulib valgrind vim vlc