diff options
author | Peter Simons <simons@cryp.to> | 2017-09-06 09:40:01 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2017-09-06 10:19:18 +0200 |
commit | 89f5d52cf44baec14a7f542a605243777b16e7a5 (patch) | |
tree | 64018c5ac3fa02da278b0dcba3983d0d327013e9 /pkgs/development/compilers/ghcjs | |
parent | f2a76b6c292866e887684a2e7cf0b1e75ffb80cf (diff) |
Revert "Merge pull request #27209 from nc6/nc/haskell-multiple-out"
This reverts commit dfb0f254844150d05d34150a975e6479b883d409, reversing
changes made to 7f8ff024372f985e96b438fa5591d9b43fc6e7bd. These changes broke
the ghcWithPackages wrapper:
nix-shell -p "haskellPackages.ghcWithPackages (ps: [ps.mtl])" --run "ghc-pkg list mtl"
/nix/store/szz84j5k1dy3jdashis6ws28d8l8zxxb-ghc-8.0.2-with-packages/lib/ghc-8.0.2/package.conf.d
(no packages)
Diffstat (limited to 'pkgs/development/compilers/ghcjs')
-rw-r--r-- | pkgs/development/compilers/ghcjs/base.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/compilers/ghcjs/base.nix b/pkgs/development/compilers/ghcjs/base.nix index 051e7daaa3eb..a7381fa1a146 100644 --- a/pkgs/development/compilers/ghcjs/base.nix +++ b/pkgs/development/compilers/ghcjs/base.nix @@ -118,7 +118,7 @@ in mkDerivation (rec { lens optparse-applicative parallel safe shelly split stringsearch syb system-fileio system-filepath tar terminfo text-binary unordered-containers vector wl-pprint-text yaml - (stdenv.lib.getBin alex) (stdenv.lib.getBin happy) git gnumake autoconf automake libtool patch gmp + alex happy git gnumake autoconf automake libtool patch gmp base16-bytestring cryptohash executable-path haddock-api transformers-compat QuickCheck haddock hspec xhtml regex-posix libiconv |