From 70467b9a126a09ae0d90929e06dffe5180d2896e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Mar 2018 20:49:01 +0100 Subject: [PATCH] Fix cross-compilation builds of several Haskell packages. --- .../haskell-modules/configuration-common.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 69a8bf1e8f2..0466e77738f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -102,6 +102,7 @@ self: super: { # Test suite doesn't terminate hzk = dontCheck super.hzk; + # Tests require a Kafka broker running locally haskakafka = dontCheck super.haskakafka; @@ -937,11 +938,11 @@ self: super: { JuicyPixels = dontHaddock super.JuicyPixels; # armv7l fixes. - happy = if pkgs.stdenv.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 - hashable = if pkgs.stdenv.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 - servant-docs = if pkgs.stdenv.isArm then dontCheck super.servant-docs else super.servant-docs; - servant-swagger = if pkgs.stdenv.isArm then dontCheck super.servant-swagger else super.servant-swagger; - swagger2 = if pkgs.stdenv.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2; + happy = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 + hashable = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.hashable else super.hashable; # https://github.com/tibbe/hashable/issues/95 + servant-docs = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.servant-docs else super.servant-docs; + servant-swagger = if pkgs.stdenv.hostPlatform.isArm then dontCheck super.servant-swagger else super.servant-swagger; + swagger2 = if pkgs.stdenv.hostPlatform.isArm then dontHaddock (dontCheck super.swagger2) else super.swagger2; # Tries to read a file it is not allowed to in the test suite load-env = dontCheck super.load-env;