Skip to content

haskell.compiler.ghc8102Binary: fix w/ store path containing "xxx"#169230

Merged
cdepillabout merged 1 commit intoNixOS:haskell-updatesfrom
sternenseemann:ghc-8.10.2-binary-xxx-workaround
Apr 22, 2022
Merged

haskell.compiler.ghc8102Binary: fix w/ store path containing "xxx"#169230
cdepillabout merged 1 commit intoNixOS:haskell-updatesfrom
sternenseemann:ghc-8.10.2-binary-xxx-workaround

Conversation

@sternenseemann
Copy link
Member

@sternenseemann sternenseemann commented Apr 18, 2022 •
edited
Loading

At some point in Makefile xxx is substituted for three spaces relating
to package files, causing it to access a nonexistent path.

Description of changes
Things done
  • 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 Apr 18, 2022
@sternenseemann
Copy link
Member Author

sternenseemann commented Apr 18, 2022

@ofborg build pkgsMusl.haskell.compiler.ghc8102Binary pkgsMusl.haskell.compiler.ghc8102BinaryMinimal

@sternenseemann
Copy link
Member Author

sternenseemann commented Apr 18, 2022

@ofborg build haskell.compiler.ghc8102BinaryMinimal

@ofborg ofborg bot requested a review from guibou April 18, 2022 20:40
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 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 Apr 18, 2022
@sternenseemann sternenseemann marked this pull request as draft April 19, 2022 08:32
@sternenseemann
Copy link
Member Author

sternenseemann commented Apr 19, 2022

Filed issue https://gitlab.haskell.org/ghc/ghc/-/issues/21402

cdepillabout
cdepillabout reviewed Apr 21, 2022
View reviewed changes
pkgs/development/compilers/ghc/8.10.2-binary.nix Outdated
Copy link
Member

@cdepillabout cdepillabout Apr 21, 2022

Choose a reason for hiding this comment

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

Suggested change
# contain this string.
# contain this string.
# https://gitlab.haskell.org/ghc/ghc/-/issues/21402

@cdepillabout
Copy link
Member

cdepillabout commented Apr 21, 2022

@sternenseemann This fix seems reasonable to me. Is there anything keeping you from merging this in?

@sternenseemann
Copy link
Member Author

sternenseemann commented Apr 21, 2022 via email

@sternenseemann
haskell.compiler: fix binary GHCs with store paths containing "xxx"
d331463 
At some point in hadrian's installation Makefile used for e.g. alpine
bindists 'xxx' is used as a placeholder for three spaces and later
substituted back. This breaks if the store path itself contains 'xxx'.
We adapt an upstream patch which will be part of 9.4 (and presumably
9.0.3 and 9.2.3) as a workaround for this issue for 8.10.2 and 8.10.7
which are the binary GHCs in nixpkgs affected.
@sternenseemann sternenseemann force-pushed the ghc-8.10.2-binary-xxx-workaround branch from 4e3ed8b to d331463 Compare April 22, 2022 12:28
@sternenseemann sternenseemann marked this pull request as ready for review April 22, 2022 12:28
@sternenseemann
Copy link
Member Author

sternenseemann commented Apr 22, 2022

@ofborg build haskell.compiler.ghc8102Binary haskell.compiler.ghc8102BinaryMinimal haskell.compiler.ghc8107Binary haskell.compiler.ghc8107BinaryMinimal

@sternenseemann
Copy link
Member Author

sternenseemann commented Apr 22, 2022

@ofborg build pkgsMusl.haskell.compiler.ghc8102Binary pkgsMusl.haskell.compiler.ghc8102BinaryMinimal pkgsMusl.haskell.compiler.ghc8107Binary pkgsMusl.haskell.compiler.ghc8107BinaryMinimal

@ofborg ofborg bot requested review from cdepillabout, domenkozar and prusnak April 22, 2022 12:53
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 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 Apr 22, 2022
cdepillabout
cdepillabout approved these changes Apr 22, 2022
View reviewed changes
Copy link
Member

@cdepillabout cdepillabout left a comment

Choose a reason for hiding this comment

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

Looks good to me, thanks for taking the time to fix this up!

@sternenseemann
Copy link
Member Author

sternenseemann commented Apr 22, 2022

Merge anytime a set rebuild is convenient to you :) It's not super pressing, as we worked around it successfully.

@cdepillabout
Copy link
Member

cdepillabout commented Apr 22, 2022

We need to give 7 few days for glirc to be fixed from #169513 (comment), so I imagine now is a pretty good time to do the set rebuild.

@cdepillabout cdepillabout merged commit 7150651 into NixOS:haskell-updates Apr 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cdepillabout cdepillabout cdepillabout approved these changes

@maralorn maralorn Awaiting requested review from maralorn

@expipiplus1 expipiplus1 Awaiting requested review from expipiplus1

@guibou guibou Awaiting requested review from guibou

@prusnak prusnak Awaiting requested review from prusnak

@domenkozar domenkozar Awaiting requested review from domenkozar

Assignees

No one assigned

Labels

6.topic: haskell General-purpose, statically typed, purely functional programming language 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 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 @cdepillabout