From c774347c25bf4c7e0a47e84dcbe18ca2bb9363a6 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 23 Mar 2024 15:41:13 +0100 Subject: [PATCH] haskell.compiler.ghcHEAD: 9.9.20231121 -> 9.11.20240323 Adds a new core package `os-string`. --- pkgs/development/compilers/ghc/head.nix | 6 +-- .../configuration-ghc-9.12.x.nix | 53 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 +- 3 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a6fff5feb6b0..ab7771e94733 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,5 +1,5 @@ import ./common-hadrian.nix { - version = "9.9.20231121"; - rev = "955520c6c4f07187b6d5e4770ecf681cc78374f2"; - sha256 = "0pv77khciv513aw64pfac5p60xn5z90rxl84dcalj6knmbhm8dqy"; + version = "9.11.20240323"; + rev = "8f7cfc7ee00978fda14f31ce4a56ad4639c07138"; + sha256 = "1id5gmn472zrzx372hy4wci5sby941jd8imspgaam6vrqxibdyln"; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix new file mode 100644 index 000000000000..7133db2abccc --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -0,0 +1,53 @@ +{ 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; + os-string = 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 haskellLib.doDistribute self.terminfo_0_4_1_6; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b0c098ddcaa8..ddfd8146b53d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -505,7 +505,7 @@ in { ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { }; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { }; }; ghcjs = packages.ghcjs810;