From 8a54680cf2d35ea9e0ab1649e574bac4a32b02b2 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 21 Feb 2022 00:37:08 +0100 Subject: [PATCH] haskellPackages.Spock: unbreak Surprisingly, we didn't have one of Haskell's popular web frameworks working, but luckily it was quite easy to get working again. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a960627f5239..0c36e8a67343 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1365,6 +1365,9 @@ self: super: { }) ] super.Spock-core); + # Test suite fails to compile https://github.com/agrafix/Spock/issues/177 + Spock = dontCheck super.Spock; + # hasura packages need some extra care graphql-engine = overrideCabal (drv: { patches = [ ./patches/graphql-engine-mapkeys.patch ]; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index c1e9c574f137..d6d26097cd08 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4642,7 +4642,6 @@ broken-packages: - splint - split-morphism - splitter - - Spock - Spock-api-ghcjs - spoonutil - spoty diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c0f880274db3..dbe325289766 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -19169,8 +19169,6 @@ self: { ]; description = "Another Haskell web framework for rapid development"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "Spock-api" = callPackage