haskell.packages.ghc912: 9.12.3 -> 9.12.4.20260606 (#529900)

This commit is contained in:
sternenseemann 2026-06-09 15:11:44 +00:00 committed by GitHub
commit 3c3354afa3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 22 additions and 29 deletions

View file

@ -0,0 +1,5 @@
import ./common-hadrian.nix {
version = "9.12.4.20260606";
url = "https://downloads.haskell.org/~ghc/9.12.5-rc1/ghc-9.12.4.20260606-src.tar.gz";
sha256 = "f78e3c6aee5c769b225f20b0ea17d03ca8df28f56e02e75d5318c60c8132753f";
}

View file

@ -41,7 +41,7 @@ self: super: {
# core pkgs on later GHCs that we can reasonably provide a stub
# or Hackage released version for (though they may not build).
Cabal-syntax = self.Cabal-syntax_3_6_0_0;
semaphore-compat = self.semaphore-compat_1_0_0;
semaphore-compat = self.semaphore-compat_2_0_0;
os-string = self.os-string_2_0_10;
file-io = self.file-io_0_2_0;
# Would need 2.25.*, but let's not bother

View file

@ -53,7 +53,7 @@ self: super: {
Win32 = null;
# Becomes a core package in GHC >= 9.8
semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
semaphore-compat = doDistribute self.semaphore-compat_2_0_0;
# Becomes a core package in GHC >= 9.10
os-string = doDistribute self.os-string_2_0_10;

View file

@ -64,7 +64,7 @@ in
iserv-proxy = addBuildDepend self.libiserv super.iserv-proxy;
# Becomes a core package in GHC >= 9.8
semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
semaphore-compat = doDistribute self.semaphore-compat_2_0_0;
# Becomes a core package in GHC >= 9.10
os-string = doDistribute self.os-string_2_0_10;

View file

@ -119,7 +119,6 @@ extra-packages:
- ormolu == 0.7.4.0 # 2023-09-21: for ghc-lib-parser 9.8 compat
- path == 0.9.5 # 2025-09-21: Pin for hls on ghc 9.4
- postgresql-binary < 0.14 # 2025-01-19: Needed for building postgrest
- semaphore-compat == 1.0.* # 2026-05-27: Match GHC 9.2 / Stackage Nightly
- shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.*
- ShellCheck == 0.10.0 # 2026-05-30: pinned by haskell-ci
- simple-get-opt < 0.5 # 2025-05-01: for crux-0.7.2

View file

@ -609698,30 +609698,6 @@ self: {
}
) { };
semaphore-compat_1_0_0 = callPackage (
{
mkDerivation,
base,
exceptions,
unix,
}:
mkDerivation {
pname = "semaphore-compat";
version = "1.0.0";
sha256 = "1qnrdqayrdazmsflh37p1igd25nh1cfgn4k1v3jwwb0w0amnyvhw";
revision = "4";
editedCabalFile = "1sgk940k24ig1r50ycz4w79591hqjys4sdmfifgsr6zcq3183zrd";
libraryHaskellDepends = [
base
exceptions
unix
];
description = "Cross-platform abstraction for system semaphores";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
hydraPlatforms = lib.platforms.none;
}
) { };
semaphore-compat_2_0_0 = callPackage (
{
mkDerivation,

View file

@ -66,7 +66,7 @@ let
ghc96 = sets.ghc967;
ghc98 = sets.ghc984;
ghc910 = sets.ghc9103;
ghc912 = sets.ghc9123;
ghc912 = sets.ghc9125;
ghc914 = sets.ghc9141;
microhs_0_15 = sets.microhs_0_15_4_0;
@ -177,6 +177,14 @@ in
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc9125 = callPackage ../development/compilers/ghc/9.12.5.nix {
bootPkgs =
# No suitable bindist packaged yet
bb.packages.ghc9103;
inherit (buildPackages.python3Packages) sphinx;
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc9141 = callPackage ../development/compilers/ghc/9.14.1.nix {
bootPkgs =
# No suitable bindist packaged yet
@ -284,6 +292,11 @@ in
ghc = bh.compiler.ghc9124;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
};
ghc9125 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc9125;
ghc = bh.compiler.ghc9125;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
};
ghc9141 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc9141;
ghc = bh.compiler.ghc9141;