Unverified Commit 867f6b8b authored by sternenseemann's avatar sternenseemann Committed by GitHub
Browse files

haskell.compiler.ghc9123: init at 9.12.3 (#474597)

parents 8e5bcf7f f3958665
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
import ./common-hadrian.nix {
  version = "9.12.3";
  sha256 = "209023906ce460e5288c9844b728a7f704868269489dc724ed097da550f6e869";
}
+1 −3
Original line number Diff line number Diff line
@@ -126,7 +126,5 @@ with haskellLib;
  # Test failure because of GHC bug:
  #   https://gitlab.haskell.org/ghc/ghc/-/issues/25937
  #   https://github.com/sol/interpolate/issues/20
  interpolate =
    assert super.ghc.version == "9.12.2";
    dontCheck super.interpolate;
  interpolate = dontCheckIf (lib.versionOlder self.ghc.version "9.12.3") super.interpolate;
}
+13 −0
Original line number Diff line number Diff line
@@ -178,6 +178,14 @@ in
        inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
        inherit buildTargetLlvmPackages llvmPackages;
      };
      ghc9123 = callPackage ../development/compilers/ghc/9.12.3.nix {
        bootPkgs =
          # No suitable bindist packaged yet
          bb.packages.ghc9103;
        inherit (buildPackages.python3Packages) sphinx;
        inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
        inherit buildTargetLlvmPackages llvmPackages;
      };
      ghc912 = compiler.ghc9122;
      ghc9141 = callPackage ../development/compilers/ghc/9.14.1.nix {
        bootPkgs =
@@ -282,6 +290,11 @@ in
        ghc = bh.compiler.ghc9122;
        compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
      };
      ghc9123 = callPackage ../development/haskell-modules {
        buildHaskellPackages = bh.packages.ghc9123;
        ghc = bh.compiler.ghc9123;
        compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
      };
      ghc912 = packages.ghc9122;
      ghc9141 = callPackage ../development/haskell-modules {
        buildHaskellPackages = bh.packages.ghc9141;
+7 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ let
    ghc984
    ghc9102
    ghc9103
    ghc9122
    ghc9122 # TODO(@sternenseemann): drop
    ghc9123
  ];

  # packagePlatforms applied to `haskell.packages.*`
@@ -540,6 +541,7 @@ let
      Cabal_3_10_3_0 = lib.subtractLists [
        # time < 1.13 conflicts with time == 1.14.*
        compilerNames.ghc9122
        compilerNames.ghc9123
      ] released;
      Cabal_3_12_1_0 = released;
      Cabal_3_14_2_0 = released;
@@ -558,6 +560,7 @@ let
        compilerNames.ghc9102
        compilerNames.ghc9103
        compilerNames.ghc9122
        compilerNames.ghc9123
      ] released;
      hpack = released;
      hsdns = released;
@@ -570,9 +573,11 @@ let
      ghc-lib-parser-ex = released;
      ghc-source-gen = lib.subtractLists [
        compilerNames.ghc9122
        compilerNames.ghc9123
      ] released;
      ghc-tags = lib.subtractLists [
        compilerNames.ghc9122
        compilerNames.ghc9123
      ] released;
      hashable = released;
      primitive = released;
@@ -585,6 +590,7 @@ let
        compilerNames.ghc9102
        compilerNames.ghc9103
        compilerNames.ghc9122
        compilerNames.ghc9123
      ] released;
    })
    {