Ben Gamari pushed to branch wip/backports-9.14 at Glasgow Haskell Compiler / GHC

Commits:

3 changed files:

Changes:

  • .gitlab/darwin/toolchain.nix
    ... ... @@ -16,18 +16,17 @@ let
    16 16 
       ghcBindists = let version = ghc.version; in {
    17 17 
         aarch64-darwin = hostPkgs.fetchurl {
    18 18 
           url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz";
    19 
    -      sha256 = "sha256-c1GTMJf3/yiW/t4QL532EswD5JVlgA4getkfsxj4TaA=";
    19 
    +      sha256 = "sha256-/6+DtdeossBJIMbjkJwL4h3eJ7rzgNCV+ifoQKOi6AQ=";
    20 20 
         };
    21 21 
         x86_64-darwin = hostPkgs.fetchurl {
    22 22 
           url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
    23 
    -      sha256 = "sha256-LrYniMG0phsvyW6dhQC+3ompvzcxnwAe6GezEqqzoTQ=";
    23 
    +      sha256 = "sha256-jPIhiJMOENesUnDUJeIaPatgavc6ZVSTY5NFIAxlC+k=";
    24 24 
         };
    25 25
    26 26 
       };
    27 27
    28 28 
       ghc = pkgs.stdenv.mkDerivation rec {
    29 
    -    # Using 9.6.2 because of #24050
    30 
    -    version = "9.6.2";
    29 
    +    version = "9.10.1";
    31 30 
         name = "ghc";
    32 31 
         src = ghcBindists.${pkgs.stdenv.hostPlatform.system};
    33 32 
         configureFlags = [

  • .gitlab/generate-ci/gen_ci.hs
    ... ... @@ -478,7 +478,7 @@ opsysVariables _ (Windows {}) = mconcat
    478 478 
       , "LANG" =: "en_US.UTF-8"
    479 479 
       , "CABAL_INSTALL_VERSION" =: "3.10.2.0"
    480 480 
       , "HADRIAN_ARGS" =: "--docs=no-sphinx-pdfs"
    481 
    -  , "GHC_VERSION" =: "9.6.4"
    481 
    +  , "GHC_VERSION" =: "9.10.1"
    482 482 
       ]
    483 483 
     opsysVariables _ _ = mempty
    484 484

  • .gitlab/jobs.yaml
    ... ... @@ -3698,7 +3698,7 @@
    3698 3698 
           "BUILD_FLAVOUR": "validate",
    3699 3699 
           "CABAL_INSTALL_VERSION": "3.10.2.0",
    3700 3700 
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    3701 
    -      "GHC_VERSION": "9.6.4",
    3701 
    +      "GHC_VERSION": "9.10.1",
    3702 3702 
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    3703 3703 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    3704 3704 
           "LANG": "en_US.UTF-8",
    ... ... @@ -3761,7 +3761,7 @@
    3761 3761 
           "BUILD_FLAVOUR": "validate",
    3762 3762 
           "CABAL_INSTALL_VERSION": "3.10.2.0",
    3763 3763 
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    3764 
    -      "GHC_VERSION": "9.6.4",
    3764 
    +      "GHC_VERSION": "9.10.1",
    3765 3765 
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    3766 3766 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    3767 3767 
           "LANG": "en_US.UTF-8",
    ... ... @@ -5579,7 +5579,7 @@
    5579 5579 
           "BUILD_FLAVOUR": "release",
    5580 5580 
           "CABAL_INSTALL_VERSION": "3.10.2.0",
    5581 5581 
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    5582 
    -      "GHC_VERSION": "9.6.4",
    5582 
    +      "GHC_VERSION": "9.10.1",
    5583 5583 
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    5584 5584 
           "IGNORE_PERF_FAILURES": "all",
    5585 5585 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    ... ... @@ -5643,7 +5643,7 @@
    5643 5643 
           "BUILD_FLAVOUR": "release",
    5644 5644 
           "CABAL_INSTALL_VERSION": "3.10.2.0",
    5645 5645 
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    5646 
    -      "GHC_VERSION": "9.6.4",
    5646 
    +      "GHC_VERSION": "9.10.1",
    5647 5647 
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    5648 5648 
           "IGNORE_PERF_FAILURES": "all",
    5649 5649 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    ... ... @@ -7982,7 +7982,7 @@
    7982 7982 
           "BUILD_FLAVOUR": "validate",
    7983 7983 
           "CABAL_INSTALL_VERSION": "3.10.2.0",
    7984 7984 
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    7985 
    -      "GHC_VERSION": "9.6.4",
    7985 
    +      "GHC_VERSION": "9.10.1",
    7986 7986 
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    7987 7987 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    7988 7988 
           "LANG": "en_US.UTF-8",
    ... ... @@ -8044,7 +8044,7 @@
    8044 8044 
           "BUILD_FLAVOUR": "validate",
    8045 8045 
           "CABAL_INSTALL_VERSION": "3.10.2.0",
    8046 8046 
           "CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    8047 
    -      "GHC_VERSION": "9.6.4",
    8047 
    +      "GHC_VERSION": "9.10.1",
    8048 8048 
           "HADRIAN_ARGS": "--docs=no-sphinx-pdfs",
    8049 8049 
           "INSTALL_CONFIGURE_ARGS": "--enable-strict-ghc-toolchain-check",
    8050 8050 
           "LANG": "en_US.UTF-8",

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help