diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 44af72af1cf7..4d37668fd017 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1519,4 +1519,12 @@ self: super: { # 2020-11-23: https://github.com/cdornan/fmt/issues/30 fmt = dontCheck super.fmt; + + # 2020-11-27: Tests broken + # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 + servant-swagger = dontCheck super.servant-swagger; + + # 2020-11-27: cxx-options is broken in Cabal 3.2.0.0 + hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 3c628a7a453a..60d3f4232464 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -73,9 +73,6 @@ self: super: { shellmet = doJailbreak super.shellmet; shower = doJailbreak super.shower; - # Broken test compile - servant-swagger = dontCheck super.servant-swagger; - # The shipped Setup.hs file is broken. csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); @@ -95,8 +92,4 @@ self: super: { # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; - - # cxx-options is broken in Cabal 3.2.0.0 - hercules-ci-agent = addSetupDepend super.hercules-ci-agent self.Cabal_3_2_1_0; - } diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2fb34b3f788c..b3fc865fa8fd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -123186,8 +123186,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.7.4"; - sha256 = "0yj9njd168xpj4har99mbb9rr5dqsbnzqs1061s3czrzlp229z3l"; + version = "0.7.5"; + sha256 = "0v3wyz8fm3n6rwanjgfxws6f18kp3qmgwx5g4f0xy00mxjzswjrq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123225,8 +123225,7 @@ self: { doHaddock = false; description = "Runs Continuous Integration tasks on your machines"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {bdw-gc = null; inherit (pkgs) boost; inherit (pkgs) nix;}; "hercules-ci-api-agent" = callPackage @@ -123257,8 +123256,7 @@ self: { ]; description = "API definition for Hercules CI Agent to talk to hercules-ci.com or Hercules CI Enterprise"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {}; "hercules-ci-api-core" = callPackage @@ -123281,8 +123279,7 @@ self: { ]; description = "Types and convenience modules use across Hercules CI API packages"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {}; "here" = callPackage