Skip to content

haskellPackages: unconditionally apply GHC patches waiting on upstream developments #455401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wolfgangwalther merged 1 commit into from
Jan 11, 2026
+13 −14
Merged

haskellPackages: unconditionally apply GHC patches waiting on upstream developments #455401

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions pkgs/development/compilers/ghc/common-hadrian.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,18 +211,6 @@
./Cabal-3.16-paths-fix-cycle-aarch64-darwin.patch
)
]
++ lib.optionals stdenv.targetPlatform.isWindows [
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13919
(fetchpatch {
name = "include-modern-utimbuf.patch";
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/7e75928ed0f1c4654de6ddd13d0b00bf4b5c6411.patch";
hash = "sha256-sb+AHdkGkCu8MW0xoQIpD5kEc0zYX8udAMDoC+TWc0Q=";
})
]
++ lib.optionals stdenv.targetPlatform.isGhcjs [
# https://gitlab.haskell.org/ghc/ghc/-/issues/26290
./export-heap-methods.patch
]
# Prevents passing --hyperlinked-source to haddock. Note that this can
# be configured via a user defined flavour now. Unfortunately, it is
# impossible to import an existing flavour in UserSettings, so patching
Expand Down Expand Up @@ -274,8 +262,19 @@
})
]

# Missing ELF symbols
++ lib.optionals stdenv.targetPlatform.isAndroid [
# Unreleased or still in-progress upstream
++ [
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13919
(fetchpatch {
name = "include-modern-utimbuf.patch";
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/7e75928ed0f1c4654de6ddd13d0b00bf4b5c6411.patch";
hash = "sha256-sb+AHdkGkCu8MW0xoQIpD5kEc0zYX8udAMDoC+TWc0Q=";
})

# https://gitlab.haskell.org/ghc/ghc/-/issues/26290 krank:ignore-line
./export-heap-methods.patch

# https://gitlab.haskell.org/ghc/ghc/-/issues/26518 krank:ignore-line
./ghc-define-undefined-elf-st-visibility.patch
]

Expand Down
Loading