From ffe05e74763b0cac1ebdece1485985394739a4f1 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Tue, 13 Jan 2015 17:35:14 +0000 Subject: [PATCH 1/3] haskellng: Fix elm ecosytem by adding a few special cases. --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index efb2a2a89db..3be34a38bbf 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -26,6 +26,18 @@ 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; + # "curl" means pkgs.curl git-annex = super.git-annex.override { inherit (pkgs) git rsync gnupg1 curl lsof openssh which bup perl wget; }; From 381ba6b22f7a947c382ed7b60361ed98a0c61ee1 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Tue, 13 Jan 2015 18:00:01 +0000 Subject: [PATCH 2/3] haskellng: disable safecopy's broken tests. --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3be34a38bbf..fc2fd874dd9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -38,6 +38,8 @@ self: super: { # release: bumped language-ecmascript's limit in git already. elm-compiler = doJailbreak super.elm-compiler; + safecopy = dontCheck super.safecopy; + # "curl" means pkgs.curl git-annex = super.git-annex.override { inherit (pkgs) git rsync gnupg1 curl lsof openssh which bup perl wget; }; From 123039c22eb7f67d55b24842fbb23a27a0d35647 Mon Sep 17 00:00:00 2001 From: Tom Hunger Date: Tue, 13 Jan 2015 18:36:36 +0000 Subject: [PATCH 3/3] haskellng: Make haskell-zeromq4 pick up the correct zeromq nix package. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fc2fd874dd9..839c17191ac 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -40,6 +40,10 @@ self: super: { 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; };