Skip to content

Switch GHC 9.0.2 and GHC 9.2.1 to bignum-native#156835

Merged
sternenseemann merged 1 commit intoNixOS:haskell-updatesfrom
cocreature:bignum-native
Jan 31, 2022
Merged

Switch GHC 9.0.2 and GHC 9.2.1 to bignum-native#156835
sternenseemann merged 1 commit intoNixOS:haskell-updatesfrom
cocreature:bignum-native

Conversation

@cocreature
Copy link
Contributor

@cocreature cocreature commented Jan 26, 2022

Motivation for this change

Neither of them support integer-simple anymore.

fixes #153742

Things done

Copied the infrastructure from ghcHead for bignum-native to 902 and 921 and dropped integer-simple (which did not work).

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.05 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Jan 26, 2022
@ofborg ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package labels Jan 26, 2022
@ofborg ofborg bot requested a review from guibou January 26, 2022 11:26
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 26, 2022
sternenseemann
sternenseemann approved these changes Jan 26, 2022
View reviewed changes
Copy link
Member

@sternenseemann sternenseemann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't checked build, but this is the diff checks out.

@cocreature
Copy link
Contributor Author

cocreature commented Jan 26, 2022

I think I messed up something, it builds but I don’t end up with bignum-native. Investigating.

@cocreature
Copy link
Contributor Author

cocreature commented Jan 26, 2022

Actually ghcHEAD also seems broken so that explains why copying still ends up with something broken

moritz@adjunction ~/c/nixpkgs (bignum-native)> NIX_PATH=nixpkgs=. nix-shell -p 'pkgs.haskell.packages.native-bignum.ghcHEAD.ghcWithPackages(pkgs: [])' --command "ghc-pkg list | grep gmp"
    integer-gmp-1.1

Did this use to work correctly?

@sternenseemann
Copy link
Member

sternenseemann commented Jan 26, 2022

Did this use to work correctly?

Binaries don't appear to be linking against gmp, so maybe the package db entry is to be expected?!

@cocreature
Copy link
Contributor Author

cocreature commented Jan 26, 2022 •
edited
Loading

Good point yeah apparently it is a compat library and it is expected. So it seems to work correctly for my ghc 902 package as well (as in I checked that binaries don’t link against gmp).

@cocreature
Copy link
Contributor Author

cocreature commented Jan 30, 2022

Hey just wanted to make sure this isn’t blocked on me. If there are any more tests you’d like me to run before merging this let me know.

@sternenseemann sternenseemann changed the base branch from master to haskell-updates January 31, 2022 14:05
@sternenseemann
Copy link
Member

sternenseemann commented Jan 31, 2022

Going to do a test build and merge later or tomorrow is the plan.

@ofborg ofborg bot requested a review from sternenseemann January 31, 2022 14:17
@sternenseemann
Copy link
Member

sternenseemann commented Jan 31, 2022 •
edited
Loading

Actually, can you adjust the commit message according to CONTRIBUTING.md? So prefixed with haskell.compiler.ghc{902,921}: or similar. Tested build and compiling test executables, no references to gmp encountered.

@cocreature
haskell.compiler.ghc{902,921}: Switch GHC 9.0/9.2 to bignum-native
2ef0874 
Neither of them support integer-simple anymore.

fixes NixOS#153742
@cocreature
Copy link
Contributor Author

cocreature commented Jan 31, 2022

Adjusted the commit message

@sternenseemann sternenseemann merged commit f82aeba into NixOS:haskell-updates Jan 31, 2022
@cocreature
Copy link
Contributor Author

cocreature commented Jan 31, 2022

Thanks @sternenseemann!

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

@guibou guibou Awaiting requested review from guibou

@sternenseemann sternenseemann Awaiting requested review from sternenseemann

Assignees

No one assigned

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

integer-simple does not exist for >= GHC 9.0

2 participants

@cocreature @sternenseemann