Skip to content

haskell.compiler.ghc*: refactor how derivation names work#139164

Merged
sternenseemann merged 2 commits intoNixOS:haskell-updatesfrom
sternenseemann:ghc-pname
Sep 23, 2021
Merged

haskell.compiler.ghc*: refactor how derivation names work#139164
sternenseemann merged 2 commits intoNixOS:haskell-updatesfrom
sternenseemann:ghc-pname

Conversation

@sternenseemann
Copy link
Copy Markdown
Member

@sternenseemann sternenseemann commented Sep 23, 2021

Motivation for this change
  • Use pname and version everywhere
  • Move -binary suffix before the version in order to not confuse parseDrvName etc.
  • Add variantSuffix as contributed by @nh2 (with a fix for GHC HEAD which no longer has integer-simple, but bignum backend native)
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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.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.

sternenseemann and others added 2 commits September 23, 2021 15:37
@sternenseemann
haskell.compiler.ghc*: use pname instead of name
d3d6982 
This also means the -binary suffix is moved *before* the version which
prevents builtins.parseDrvName from interpreting it as part of the version.
@nh2 @sternenseemann
haskell.compiler.ghc*: Add variantSuffix.
48c5ca6 
When debugging musl builds, I often have to sift through thousands of lines
of `nix-store -q --tree` or `nix-store -qR` output.
Until now, `pkgsMusl` and normal `pkgs` GHCs looked exactly the same in
there, making that task tough.

Same for `integer-simple`, which makes debugging `gmp` issues easier.

This commit introduces a suffix to tell them apart easily.

Note that this is different from `targetPrefix` which is for
cross-compilation, which `pkgsMusl` does not do.

For GHC HEAD, integer-simple no longer exists, instead we now have a
“bignum backend”, so we just call the integer-simple successor
native-bignum.

Co-Authored-By: sternenseemann <sternenseemann@systemli.org>
@github-actions github-actions bot added the 6.topic: haskell General-purpose, statically typed, purely functional programming language label Sep 23, 2021
@ofborg ofborg bot requested review from domenkozar, guibou and prusnak September 23, 2021 13:50
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 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. labels Sep 23, 2021
@sternenseemann sternenseemann merged commit 998e40c into NixOS:haskell-updates Sep 23, 2021
@sternenseemann sternenseemann deleted the ghc-pname branch September 23, 2021 14:41
@sternenseemann sternenseemann mentioned this pull request Sep 23, 2021
Closed
15 tasks
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

@prusnak prusnak Awaiting requested review from prusnak

@guibou guibou Awaiting requested review from guibou

@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 @nh2