-
-
Notifications
You must be signed in to change notification settings - Fork 14.1k
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.
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
ghc: hadrian patch fix for fully_static #317175
ghc: hadrian patch fix for fully_static #317175
Conversation
This will need a backport to |
eba4afc
to
331262e
Compare
We could theoretically only apply this patch for the exact configuration which we want to use it for. i.e. |
We can also only turn on this patch when Edit: Started typing that before the previous comment was posted. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for tracking this patch down.
The commit message should use haskell.compiler.ghc96
as prefix since it is more specific.
@@ -170,6 +171,11 @@ | |||
then ./docs-sphinx-7-ghc98.patch | |||
else ./docs-sphinx-7.patch ) | |||
] | |||
++ lib.optional (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.8") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please use lib.optionals
for consistency with the rest of the logic.
@@ -170,6 +171,11 @@ | |||
then ./docs-sphinx-7-ghc98.patch | |||
else ./docs-sphinx-7.patch ) | |||
] | |||
++ lib.optional (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.8") | |||
(fetchpatch { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please use the name
argument to fetchpatch to give this patch a descriptive name which helps when debugging.
No, patches should be unconditional if possible to reduce complexity. |
331262e
to
7d5e374
Compare
@sternenseemann Thanks for the quick review. I've fixed what you mentioned, I think. |
Ah, one more thing: You need to remove the |
7d5e374
to
e526117
Compare
@sternenseemann In order! What's the rest of the process? Is there any info about how to do a backport? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'll merge this for the next haskell-updates iteration so we don't block fixes in the current iteration much longer.
The backport will happen semi-automatically via github actions. The process is also described in CONTRIBUTING.md |
Successfully created backport PR for |
See: #125 (comment) By cherry-picking nixpkgs fix NixOS/nixpkgs#317175 by @NorfairKing
Note that e.g. on haskellPackages = dontRecurseIntoAttrs
# Prefer native-bignum to avoid linking issues with gmp
# GHC 9.6 rts can't be built statically with hadrian, so we need to use 9.4
# until 9.8 is ready
(if stdenv.hostPlatform.isStatic then haskell.packages.native-bignum.ghc94
# JS backend can't use gmp
else if stdenv.hostPlatform.isGhcjs then haskell.packages.native-bignum.ghc96
else haskell.packages.ghc96) This PR fixes at least part of that; we should see if that can be changed now. There's still this problem: |
See: #125 (comment) By cherry-picking nixpkgs fix NixOS/nixpkgs#317175 by @NorfairKing
See: #125 (comment) By cherry-picking nixpkgs fix NixOS/nixpkgs#317175 by @NorfairKing
pkgsStatic seems to use GHC 9.4: NixOS/nixpkgs#317175 (comment)
pkgsStatic seems to use GHC 9.4: NixOS/nixpkgs#317175 (comment)
pkgsStatic seems to use GHC 9.4: NixOS/nixpkgs#317175 (comment)
Description of changes
Fixes #208959 and #316850
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.