summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2018-10-16 08:34:54 +0200
committerGitHub <noreply@github.com>2018-10-16 08:34:54 +0200
commit3f0bc924606cb5c8943bc9245d29a50fa26196ab (patch)
tree042c115db33b69364b082c43c9faf0f0599aa51f
parent8a3a91f29b4a517c540bee42f01701762243f808 (diff)
parent46f937dddd519e7e48fcaa32393956e104a0c305 (diff)
downloadnixlib-3f0bc924606cb5c8943bc9245d29a50fa26196ab.tar
nixlib-3f0bc924606cb5c8943bc9245d29a50fa26196ab.tar.gz
nixlib-3f0bc924606cb5c8943bc9245d29a50fa26196ab.tar.bz2
nixlib-3f0bc924606cb5c8943bc9245d29a50fa26196ab.tar.lz
nixlib-3f0bc924606cb5c8943bc9245d29a50fa26196ab.tar.xz
nixlib-3f0bc924606cb5c8943bc9245d29a50fa26196ab.tar.zst
nixlib-3f0bc924606cb5c8943bc9245d29a50fa26196ab.zip
Merge pull request #48498 from dhess/haskell-aarch64-fixes
haskellPackages.language-nix: disable tests on aarch64.
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 125413d61511..e59e4a67269d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -332,7 +332,7 @@ self: super: {
   itanium-abi = dontCheck super.itanium-abi;
   katt = dontCheck super.katt;
   language-slice = dontCheck super.language-slice;
-  language-nix = if pkgs.stdenv.isi686 then dontCheck super.language-nix else super.language-nix;
+  language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275
   ldap-client = dontCheck super.ldap-client;
   lensref = dontCheck super.lensref;
   lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25