diff options
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-nix.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6d0c93e85a56..db627581d8cd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -542,6 +542,9 @@ self: super: builtins.intersectAttrs super { # Break infinite recursion cycle between tasty and clock. clock = dontCheck super.clock; + # Break infinite recursion cycle between devtools and mprelude. + devtools = super.devtools.override { mprelude = dontCheck super.mprelude; }; + # loc and loc-test depend on each other for testing. Break that infinite cycle: loc-test = super.loc-test.override { loc = dontCheck self.loc; }; @@ -718,6 +721,7 @@ self: super: builtins.intersectAttrs super { # dhall's tests access the network. dhall_1_29_0 = dontCheck super.dhall_1_29_0; dhall_1_31_1 = dontCheck super.dhall_1_31_1; + dhall_1_32_0 = dontCheck super.dhall_1_32_0; cut-the-crap = let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ]; @@ -750,4 +754,26 @@ self: super: builtins.intersectAttrs super { ''; }); + postgresql-syntax = super.postgresql-syntax.override { + rerebase = self.rerebase_1_6_1; + }; + + rerebase_1_6_1 = super.rerebase_1_6_1.override { + rebase = self.rebase_1_6_1; + }; + + rebase_1_6_1 = super.rebase_1_6_1.override { + selective = super.selective_0_4_1; + }; + + # Fix compilation of Setup.hs by removing the module declaration. + # See: https://github.com/tippenein/guid/issues/1 + guid = overrideCabal (super.guid) (drv: { + prePatch = "sed -i '1d' Setup.hs"; # 1st line is module declaration, remove it + doCheck = false; + }); + + # Tests disabled as recommended at https://github.com/luke-clifton/shh/issues/39 + shh = dontCheck super.shh; + } |