From 26dc439eb43654b66056ce1d3d252d7db6ad0789 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 6 Aug 2025 14:59:36 +0200 Subject: [PATCH] haskell.compiler.ghcHEAD: 9.13.20250428 -> 9.15.20250805 We can safely drop the upper bound for the jailbreak workaround for directory >= 1.3.9.0 since all GHCs will probably have this constraint going forward. --- pkgs/development/compilers/ghc/head.nix | 6 +++--- pkgs/development/tools/haskell/hadrian/hadrian.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index eff1902bc83f..0152f0c38c7d 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.13.20250428"; - rev = "22d11fa818fae2c95c494fc0fac1f8cb4c6e7cb6"; - sha256 = "0f3xc4k662yrlx8abqqrbgvwzr0ffnpiw8z4a47nnai4xk5k0wjl"; + version = "9.15.20250805"; + rev = "c2a78cea95d2d6cdd26a1c42556aad1f368ee4bd"; + sha256 = "1pan87xyi9572rbispsvsxvajsxxzg36i35m09mk6spc5qr7a3dy"; } diff --git a/pkgs/development/tools/haskell/hadrian/hadrian.nix b/pkgs/development/tools/haskell/hadrian/hadrian.nix index 17c5a3466e15..2c3df95f2ea4 100644 --- a/pkgs/development/tools/haskell/hadrian/hadrian.nix +++ b/pkgs/development/tools/haskell/hadrian/hadrian.nix @@ -53,7 +53,7 @@ mkDerivation { # https://gitlab.haskell.org/ghc/ghc/-/issues/24382 # https://gitlab.haskell.org/ghc/ghc/-/commit/a2c033cf82635c83f3107706634bebee43297b99 (lib.versionAtLeast ghcVersion "9.6.7" && lib.versionOlder ghcVersion "9.7") - || (lib.versionAtLeast ghcVersion "9.12" && lib.versionOlder ghcVersion "9.15"); + || lib.versionAtLeast ghcVersion "9.12"; isLibrary = false; isExecutable = true; executableHaskellDepends = [