Commit 740c83e3 authored by sternenseemann's avatar sternenseemann
Browse files
parent a03df403
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
import ./common-hadrian.nix rec {
  version = "9.12.1";
  sha256 = "4a7410bdeec70f75717087b8f94bf5a6598fd61b3a0e1f8501d8f10be1492754";
}
+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@
              || stdenv.targetPlatform.isPower
              || stdenv.targetPlatform.isSparc
              || stdenv.targetPlatform.isAarch64
              || stdenv.targetPlatform.isGhcjs)
              || stdenv.targetPlatform.isGhcjs
              || (lib.versionAtLeast version "9.12" && stdenv.targetPlatform.isRiscV64))
, # LLVM is conceptually a run-time-only dependency, but for
  # non-x86, we need LLVM to bootstrap later stages, so it becomes a
  # build-time dependency too.
+6 −0
Original line number Diff line number Diff line
@@ -47,6 +47,12 @@ mkDerivation {
    # See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/1190
    "-O0"
  ];
  jailbreak =
    # Ignore lower bound on directory. Upstream uses this to avoid a race condition
    # that only seems to affect Windows. We never build GHC natively on Windows.
    # https://gitlab.haskell.org/ghc/ghc/-/issues/24382
    # https://gitlab.haskell.org/ghc/ghc/-/commit/a2c033cf82635c83f3107706634bebee43297b99
    (lib.versionAtLeast ghcVersion "9.12" && lib.versionOlder ghcVersion "9.13");
  isLibrary = false;
  isExecutable = true;
  executableHaskellDepends =
+20 −0
Original line number Diff line number Diff line
@@ -462,6 +462,20 @@ in
        llvmPackages = pkgs.llvmPackages_15;
      };
      ghc910 = compiler.ghc9101;
      ghc9121 = callPackage ../development/compilers/ghc/9.12.1.nix {
        bootPkgs =
          # No suitable bindist packaged yet
          bb.packages.ghc9101;
        inherit (buildPackages.python3Packages) sphinx;
        # Need to use apple's patched xattr until
        # https://github.com/xattr/xattr/issues/44 and
        # https://github.com/xattr/xattr/issues/55 are solved.
        inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
        # 2024-12-21: Support range >= 13 && < 20
        buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_19;
        llvmPackages = pkgs.llvmPackages_19;
      };
      ghc912 = compiler.ghc9121;
      ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
        bootPkgs =
          # No suitable bindist packaged yet
@@ -648,6 +662,12 @@ in
        compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
      };
      ghc910 = packages.ghc9101;
      ghc9121 = callPackage ../development/haskell-modules {
        buildHaskellPackages = bh.packages.ghc9121;
        ghc = bh.compiler.ghc9121;
        compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
      };
      ghc912 = packages.ghc9121;
      ghcHEAD = callPackage ../development/haskell-modules {
        buildHaskellPackages = bh.packages.ghcHEAD;
        ghc = bh.compiler.ghcHEAD;
+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ let
    ghc983
    ghc984
    ghc9101
    ghc9121
  ];

  # packagePlatforms applied to `haskell.packages.*`