haskell-generic-builder: pass pname and version as is#127658
Merged
maralorn merged 1 commit intoNixOS:haskell-updatesfrom Jun 22, 2021
Merged
Conversation
This is a full set rebuild, however it improves the name generation for the static and cross case since the respective additional components are now inserted between pname and version instead of after name like before. This prevents builtins.parseDrvName from mistaking a platform config string for a version component.
Member
Author
|
Built |
maralorn
approved these changes
Jun 21, 2021
Member
|
@sternenseemann I'm just curious, but could you give an example of how this fixes a package? For example, when doing a static or cross build, what is an example of what a package |
Member
Author
$ nix-instantiate -A pkgsStatic.haskellPackages.hello -A pkgsCross.aarch64-multiplatform.haskellPackages.hello
/nix/store/0nvxybp8av7gczd939hp8bh71x5f0vv2-hello-static-x86_64-unknown-linux-musl-1.0.0.2.drv
/nix/store/kj6cph9qwxigf446q5r8pcrrf1yrwscv-hello-aarch64-unknown-linux-gnu-1.0.0.2.drvOn master: |
Member
|
@sternenseemann Ah, nice. This looks like a strict improvement! |
Member
Author
|
See also #120762 for additional context. |
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
3 participants
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.
This is a full set rebuild, however it improves the name generation
for the static and cross case since the respective additional
components are now inserted between pname and version instead of after
name like before. This prevents builtins.parseDrvName from mistaking a
platform config string for a version component.
(Untested so far)
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)