haskellPackages: reflect changed libdir location for hadrian built GHCs#212107
Merged
sternenseemann merged 7 commits intoNixOS:haskell-updatesfrom Feb 5, 2023
Merged
haskellPackages: reflect changed libdir location for hadrian built GHCs#212107sternenseemann merged 7 commits intoNixOS:haskell-updatesfrom
sternenseemann merged 7 commits intoNixOS:haskell-updatesfrom
Conversation
Contributor
|
Working for me now. |
Member
Author
|
Need to investigate the darwin rebuilds still. Edit: Working as intended, affects |
cdepillabout
reviewed
Feb 5, 2023
cdepillabout
approved these changes
Feb 5, 2023
Member
cdepillabout
left a comment
There was a problem hiding this comment.
I'm not very familiar with what exact changes are necessary now with the Hadrian stuff, but the stuff in this PR seems reasonable.
13 tasks
`ghc ? hadrian` can be used to check if a GHC was built using hadrian. This is often relevant since hadrian changed the ghc libdir location, so we need to install libs to a different location as well.
Surprisingly, the aarch64-darwin bindist for 8.10.7 was still built using make.
82e3509 to
f540260
Compare
13 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
With hadrian ghc's libdir will be
$out/lib/${targetPrefix}ghc-${version}/libinstead of$out/lib/${targetPrefix}ghc-${version}. This is relatively inconsequential for us, since we assemble our package dbs manually in most cases and we thus can register libraries located anywhere.However, for
ghcWithPackageswe symlink our libraries into the same location as the package db shipped with GHC and runghc-pkg recache. For this to work, the installation location of the libraries need to mirror GHC's libdir. This is what this PR does.To facilitate this,
haskellPackages.mkDerivationhas been refactored a bit. It is best to review these commit by commit. If everything is done correctly, this PR should cause zero rebuilds.Fixes #211608. cc @locallycompact for testing.
haskellPackagesno rebuildspkgsCross.aarch64-multiplatform.haskellPackagesno rebuildsghcHEADwithPackagesghc8102BinarymuslwithPackagesghc8107BinarymuslwithPackagesghc924BinarymuslwithPackagesghcHEADordinary package compilationThings done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes