llvm*: Remove outputSpecified workaround where possible#218551
Merged
alyssais merged 1 commit intoNixOS:masterfrom Feb 28, 2023
Merged
llvm*: Remove outputSpecified workaround where possible#218551alyssais merged 1 commit intoNixOS:masterfrom
outputSpecified workaround where possible#218551alyssais merged 1 commit intoNixOS:masterfrom
Conversation
The effect of `.out // { outputSpecified = false; }` in these cases
is to select the default output explicitly, but then make the
selection implicit until `overrideAttrs` is called. Previously
`overrideAttrs` would not preserve output selection, masking the
apparently unnecessary behavior of this workaround.
For `libllvm-polly`, this logic does not apply, as it does not
select the default output.
The `outputSpecified` workaround was introduced in
NixOS#122554
and was perhaps rushed because of a release deadline, and expected
delays from mass rebuilds.
The change in `overrideAttrs` behavior was added in
5b2f597 / NixOS#211685
and the problem was discovered in NixOS#218537,
which may contain further information.
Member
Author
|
@ofborg build root ^ a data analysis framework by CERN |
Member
|
The only other affected package is qtcreator: - /nix/store/v5wkc9xsri9ra8aghl7g4md1f4x3gm7r-qtcreator-5.0.3.drv:{out}
+ /nix/store/2y5dgw7srynhn3zfvdn1p1dq0rdi1kc7-qtcreator-5.0.3.drv:{out}
• The set of input derivations named `clang-8.0.1` do not match
• The environments do not match:
buildInputs=''
/nix/store/04p2zzpfvv3mn7may1pad6gfvhkgj321-qtbase-5.15.8-dev /nix/store/7anaq8vz6fwi0z3s5wc6m3mfs2i253q1-qtscript-5.15.8-dev /nix/store/8s2j3xai8l0yzr4fm3qym4g76rgjjj3p-qtquickcontrols-5.15.8-dev /nix/store/3mfw8jb2b9bflwc3c261xcpls1lw93fx-qtdeclarative-5.15.8-dev /nix/store/4pma3312dam8mfi0qi6m76l7v4azb5i4-elfutils-0.188-dev /nix/store/d7ryxam6prab9i0rk1gwlbrdcpixlpiw-clang-8.0.1-dev ←/nix/store/6q89ap29qhzp1h0mxf9bwxjjxq9qvh17-clang-8.0.1←→/nix/store/ag3aj8k0lz0wykrp8xriv6dbfwvb8zgc-clang-8.0.1-dev→ /nix/store/nwl7f34bllizlgcrqv8mpkc9b36clv5h-llvm-8.0.1-devIt still builds, and it's only the build inputs that are affected rather than the clang paths that get put in the source code in |
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
2 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.
The effect of
.out // { outputSpecified = false; }in these cases is to select the default output explicitly, but then make the selection implicit untiloverrideAttrsis called. PreviouslyoverrideAttrswould not preserve output selection, masking the apparently unnecessary behavior of this workaround.For
libllvm-polly, this logic does not apply, as it does not select the default output.The
outputSpecifiedworkaround was introduced in #122554and was perhaps rushed because of a release deadline, and expected delays from mass rebuilds.
The change in
overrideAttrsbehavior was added in 5b2f597 / #211685and the problem was discovered in #218537, which may contain further information.
Description of changes
Removes apparently unnecessary workarounds and should make
pkgs.rootbuild without any changes.The number of rebuilds should hopefully be very small.
This can be undrafted and merged if
rootis the only rebuild. Will mark as draft only because the ofborg output is unknown at this time.Things 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/)