Skip to content

haskell.compiler: port all make/native-bignum GHCs to common expr#308776

Merged
sternenseemann merged 1 commit intoNixOS:haskell-updatesfrom
sternenseemann:ghc-native-bignum-common
May 16, 2024
Merged

haskell.compiler: port all make/native-bignum GHCs to common expr#308776
sternenseemann merged 1 commit intoNixOS:haskell-updatesfrom
sternenseemann:ghc-native-bignum-common

Conversation

@sternenseemann
Copy link
Member

@sternenseemann sternenseemann commented May 3, 2024

The common expression is a little messy to avoid rebuilds. It can be cleaned up in a second step.

9.4.8.fixme.nix is used temporarily so that git's rename detection gets where common-make-native-bignum.nix is coming from.

8.10.7 keeps its expression since it uses integer-simple which changes the expression's interface. This is unfortunately very annoying to reflect in a common expression.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label May 3, 2024
@sternenseemann sternenseemann force-pushed the ghc-native-bignum-common branch from df81793 to f3dc8c3 Compare May 3, 2024 11:24
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels May 3, 2024
@sternenseemann
haskell.compiler: port all make/native-bignum GHCs to common expr
88d91dd 
The common expression is a little messy to avoid rebuilds. It can be
cleaned up in a second step.

`9.4.8.fixme.nix` is used temporarily so that git's rename detection
gets where common-make-native-bignum.nix is coming from.

8.10.7 keeps its expression since it uses integer-simple which changes
the expression's interface. This is unfortunately very annoying to
reflect in a common expression.
@sternenseemann sternenseemann force-pushed the ghc-native-bignum-common branch from f3dc8c3 to 88d91dd Compare May 3, 2024 19:33
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels May 3, 2024
@sternenseemann sternenseemann marked this pull request as ready for review May 3, 2024 23:21
@sternenseemann
Copy link
Member Author

sternenseemann commented May 3, 2024

cc @AlexandreTunstall Hopefully with the file naming shenanigans I've done, it'll be easy to rebase changes onto this. Should make our lives a little easier…

@AlexandreTunstall
Copy link
Contributor

AlexandreTunstall commented May 5, 2024

My workflow so far has been to git diff the changes and then patch them onto all the other versions, but this will indeed make changes much less tedious to make, especially when there are several for different commits and they need to be git add -p for every file). I'm looking forward to rebasing.

It's a bit unfortunate that this still had to be done despite the deprecation of Make-based builds, but who knows how long Nixpkgs will continue to have these not-so-new versions of GHC.

@sternenseemann
Copy link
Member Author

sternenseemann commented May 5, 2024

I'm looking forward to rebasing.

I still need to figure out how this can be made to work properly. Maybe we need to delay renaming 9.4.8.fixme.nix further, I ran into some trouble earlier.

@sternenseemann sternenseemann force-pushed the ghc-native-bignum-common branch from b50ec8c to 88d91dd Compare May 5, 2024 16:11
@sternenseemann
Copy link
Member Author

sternenseemann commented May 5, 2024

@AlexandreTunstall Indeed, without renaming the file right away, rebasing works fine, so I'll keep it like this until we've merged all outstanding GHC changes.

@sternenseemann sternenseemann merged commit 131400c into NixOS:haskell-updates May 16, 2024
@sternenseemann sternenseemann deleted the ghc-native-bignum-common branch May 16, 2024 13:48
@sternenseemann sternenseemann mentioned this pull request Jun 11, 2024
Merged
13 tasks
sternenseemann added a commit to sternenseemann/nixpkgs that referenced this pull request Jun 11, 2024
@sternenseemann
haskell.compiler.ghc948: fix expression file name
26485d7 
This is a left over to do from NixOS#308776. Rebasing existing PR (prior
to NixOS#308776) would need to be rebased on a change before the commit
included in this PR.
sternenseemann added a commit that referenced this pull request Jun 12, 2024
@sternenseemann
haskell.compiler.ghc948: fix expression file name
702d636 
This is a left over to do from #308776. Rebasing existing PR (prior
to #308776) would need to be rebased on a change before the commit
included in this PR.
github-actions bot pushed a commit that referenced this pull request Jun 12, 2024
@sternenseemann @github-actions
haskell.compiler.ghc948: fix expression file name
dd7e3cc 
This is a left over to do from #308776. Rebasing existing PR (prior
to #308776) would need to be rebased on a change before the commit
included in this PR.

(cherry picked from commit 26485d7)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@expipiplus1 expipiplus1 Awaiting requested review from expipiplus1

@maralorn maralorn Awaiting requested review from maralorn

@ncfavier ncfavier Awaiting requested review from ncfavier

@guibou guibou Awaiting requested review from guibou

Assignees

No one assigned

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@sternenseemann @AlexandreTunstall