Skip to content

haskellPackages.ghc: 9.4.6 -> 9.4.7 (backport) [23.05] #263050

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

Jump to bottom
Merged
cdepillabout merged 1 commit into from
Oct 26, 2023
Merged

haskellPackages.ghc: 9.4.6 -> 9.4.7 (backport) [23.05] #263050

cdepillabout merged 1 commit into from
Oct 26, 2023

Conversation

@thomasjm
Copy link
Contributor

@thomasjm thomasjm commented Oct 24, 2023

Description of changes

Original PR: #252362

Original commit: 32c1a8c

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/)
  • 23.11 Release Notes (or backporting 23.05 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.

@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Oct 24, 2023
@thomasjm thomasjm marked this pull request as draft October 24, 2023 01:50
@thomasjm thomasjm marked this pull request as ready for review October 24, 2023 02:09
cdepillabout
cdepillabout reviewed Oct 24, 2023
View reviewed changes
@cdepillabout
Copy link
Member

cdepillabout commented Oct 24, 2023

@thomasjm Could you make sure your commit titles match the format recommended in https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions

Or, just squash these two commits into one

@thomasjm
Copy link
Contributor Author

thomasjm commented Oct 24, 2023

Squash is done.

@cdepillabout
Copy link
Member

cdepillabout commented Oct 24, 2023

Let's make sure some things still build:

@ofborg build haskell.packages.ghc947.conduit

@cdepillabout
Copy link
Member

cdepillabout commented Oct 25, 2023

@thomasjm Okay, looks like at least conduit builds with ghc947, which is a good sign.

However, it looks like there is an ofborg eval error: https://gist.github.com/GrahamcOfBorg/90e93cab7244d458cd22b68a9bb7507e

Could you take a look at why this is occurring? We definitely don't want to introduce new eval errors onto a release branch.

@sternenseemann @thomasjm
haskellPackages.ghc: 9.4.6 -> 9.4.7
63c25dd 
https://www.haskell.org/ghc/blog/20230825-ghc-9.4.7-released.html

Notice that useLLVM is disabled for all aarch64 platforms to match

(cherry picked from commit 32c1a8c)
@thomasjm
Copy link
Contributor Author

thomasjm commented Oct 25, 2023

I fixed the path in 9.4.7.nix to this file: Cabal-3.6-paths-fix-cycle-aarch64-darwin.patch

@ofborg build haskell.packages.ghc947.conduit

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Oct 25, 2023
@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 Oct 25, 2023
@cdepillabout
Copy link
Member

cdepillabout commented Oct 25, 2023

Okay, eval passes, and it builds on linux.

LGTM, thanks for this backport!

@cdepillabout cdepillabout merged commit 60b9db9 into NixOS:release-23.05 Oct 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sternenseemann sternenseemann Awaiting requested review from sternenseemann sternenseemann is a code owner

@maralorn maralorn Awaiting requested review from maralorn maralorn is a code owner

@cdepillabout cdepillabout Awaiting requested review from cdepillabout cdepillabout is a code owner

@expipiplus1 expipiplus1 Awaiting requested review from expipiplus1

@guibou guibou Awaiting requested review from guibou

Assignees

No one assigned

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 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.

3 participants

@thomasjm @cdepillabout @sternenseemann