diff options
author | Peter Simons <simons@cryp.to> | 2015-01-13 20:15:55 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2015-01-13 20:15:55 +0100 |
commit | 6d40648a1dc418a58229498e492e0e9e2bed4dc5 (patch) | |
tree | 2ced6f3ae8b730fd701efb0cecb2a40cf59a6bf0 | |
parent | 1072635cf0fd85d407e1c596178019bb1ea09a2f (diff) | |
parent | 123039c22eb7f67d55b24842fbb23a27a0d35647 (diff) | |
download | nixlib-6d40648a1dc418a58229498e492e0e9e2bed4dc5.tar nixlib-6d40648a1dc418a58229498e492e0e9e2bed4dc5.tar.gz nixlib-6d40648a1dc418a58229498e492e0e9e2bed4dc5.tar.bz2 nixlib-6d40648a1dc418a58229498e492e0e9e2bed4dc5.tar.lz nixlib-6d40648a1dc418a58229498e492e0e9e2bed4dc5.tar.xz nixlib-6d40648a1dc418a58229498e492e0e9e2bed4dc5.tar.zst nixlib-6d40648a1dc418a58229498e492e0e9e2bed4dc5.zip |
Merge pull request #5747 from teh/master
a few haskellng fixes
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index efb2a2a89dbf..839c17191ac3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -26,6 +26,24 @@ self: super: { # Doesn't compile with lua 5.2. hslua = super.hslua.override { lua = pkgs.lua5_1; }; + # Please also remove optparse-applicative special case from + # cabal2nix/hackage2nix.hs when removing the following. + elm-make = super.elm-make.override { + optparse-applicative = optparse-applicative_0_10_0; + }; + elm-package = super.elm-package.override { + optparse-applicative = optparse-applicative_0_10_0; + }; + # elm-compiler jail-break can be removed after next elm-compiler + # release: bumped language-ecmascript's limit in git already. + elm-compiler = doJailbreak super.elm-compiler; + + safecopy = dontCheck super.safecopy; + + zeromq4-haskell = super.zeromq4-haskell.override { + zeromq = pkgs.zeromq4; + }; + # "curl" means pkgs.curl git-annex = super.git-annex.override { inherit (pkgs) git rsync gnupg1 curl lsof openssh which bup perl wget; }; |