Commit 2ec6f635 authored by sternenseemann's avatar sternenseemann
Browse files

haskell.compiler.ghcHEAD: 9.7.20230527 -> 9.9.20231014

parent fd8a8c91
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@

  # GHC's build system hadrian built from the GHC-to-build's source tree
  # using our bootstrap GHC.
, hadrian ? bootPkgs.callPackage ../../tools/haskell/hadrian {
, hadrian ? import ../../tools/haskell/hadrian/make-hadrian.nix { inherit bootPkgs lib; } {
    ghcSrc = ghcSrc;
    ghcVersion = version;
    userSettings = hadrianUserSettings;
+3 −3
Original line number Diff line number Diff line
import ./common-hadrian.nix {
  version = "9.7.20230527";
  rev = "69fdbece5f6ca0a718bb9f1fef7b0ab57cf6b664";
  sha256 = "13rf1d27wdich0kmbds55by9vj3wz0v9clba9p8qpwz7x7wpcjz2";
  version = "9.9.20231014";
  rev = "13d3c613c3c1e4942c698449bdf58a6a13b76695";
  sha256 = "13xp4ijnym2qbw2qbxkvfb79l7034vrcm9j2j9kirbhjxzdshvx9";
}
+52 −0
Original line number Diff line number Diff line
{ pkgs, haskellLib }:

let
  inherit (pkgs) lib;
in

self: super: {
  llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;

  # Disable GHC core libraries
  array = null;
  base = null;
  binary = null;
  bytestring = null;
  Cabal = null;
  Cabal-syntax = null;
  containers = null;
  deepseq = null;
  directory = null;
  exceptions = null;
  filepath = null;
  ghc-bignum = null;
  ghc-boot = null;
  ghc-boot-th = null;
  ghc-compact = null;
  ghc-experimental = null;
  ghc-heap = null;
  ghc-internal = null;
  ghc-platform = null;
  ghc-prim = null;
  ghc-toolchain = null;
  ghci = null;
  haskeline = null;
  hpc = null;
  integer-gmp = null;
  mtl = null;
  parsec = null;
  pretty = null;
  process = null;
  rts = null;
  semaphore-compat = null;
  stm = null;
  system-cxx-std-lib = null;
  template-haskell = null;
  # GHC only builds terminfo if it is a native compiler
  terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_6;
  text = null;
  time = null;
  transformers = null;
  unix = null;
  xhtml = null;
}
+0 −7
Original line number Diff line number Diff line
##
## Caveat: a copy of configuration-ghc-8.6.x.nix with minor changes:
##
##  1. "8.7" strings
##  2. llvm 6
##  3. disabled library update: parallel
##
{ pkgs, haskellLib }:

with haskellLib;
+16 −0
Original line number Diff line number Diff line
{ mkDerivation, base, lib
  # GHC source tree to build ghc-toolchain from
, ghcSrc
, ghcVersion
}:
mkDerivation {
  pname = "ghc-platform";
  version = ghcVersion;
  src = ghcSrc;
  postUnpack = ''
    sourceRoot="$sourceRoot/libraries/ghc-platform"
  '';
  libraryHaskellDepends = [ base ];
  description = "Platform information used by GHC and friends";
  license = lib.licenses.bsd3;
}
Loading