JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5747 from teh/master

Browse Source 
a few haskellng fixes
This commit is contained in:
Peter Simons 2015-01-13 20:15:55 +01:00
commit 6d40648a1d
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -26,6 +26,24 @@ self: super: {
# Doesn't compile with lua 5.2. # Doesn't compile with lua 5.2.
hslua = super.hslua.override { lua = pkgs.lua5_1; }; 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 # "curl" means pkgs.curl
git-annex = super.git-annex.override { inherit (pkgs) git rsync gnupg1 curl lsof openssh which bup perl wget; }; git-annex = super.git-annex.override { inherit (pkgs) git rsync gnupg1 curl lsof openssh which bup perl wget; };