From e8bdec3e3234afe6b4e8dc73aa4ec7eccf6d70c0 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 18 Jul 2021 15:14:30 +0900 Subject: release-haskell: stop building aarch64 and darwin static haskell packages The statically-linked Haskell packages on Darwin are not currently working because libiconv is not building statically on Darwin. The statically-linked Haskell packages on aarch64 are timing out on Hydra. --- pkgs/top-level/release-haskell.nix | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 4d048b315358..c2e81ddbb428 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -101,17 +101,6 @@ let ghc865Binary = {}; }; - # test some statically linked packages to catch regressions - # and get some cache going for static compilation with GHC - # Use integer-simple to avoid GMP linking problems (LGPL) - pkgsStatic.haskell.packages.integer-simple.ghc8104 = { - inherit (staticHaskellPackagesPlatforms) - hello - random - lens - ; - }; - # top-level packages that depend on haskellPackages inherit (pkgsPlatforms) agda @@ -218,6 +207,23 @@ let ; elmPackages.elm = pkgsPlatforms.elmPackages.elm; + + # Test some statically linked packages to catch regressions + # and get some cache going for static compilation with GHC. + # Use integer-simple to avoid GMP linking problems (LGPL) + pkgsStatic.haskell.packages.integer-simple.ghc8104 = + removePlatforms + [ + "aarch64-linux" # times out on Hydra + "x86_64-darwin" # TODO: reenable when static libiconv works on darwin + ] + { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8104) + hello + lens + random + ; + }; }) (versionedCompilerJobs { # Packages which should be checked on more than the -- cgit 1.4.1