treewide: support structuredAttrs in setup hooks (part 3)#340592
treewide: support structuredAttrs in setup hooks (part 3)#340592philiptaron merged 12 commits intoNixOS:stagingfrom
Conversation
Currently no problematic package using multiple swiftpmFlags in nixpkgs to test.
Tested atlauncher with and without structuredAttrs.
Tested darwin.libutil with and without structuredAttrs.
cudaPackages already builts with structuredAttrs, but the cmakeFlags+= pattern incorrectly appends the additional flags to the first array argument with a space - which is now part of that argument itself since NixOS#318614, which added support for structuredAttrs to cmake.
This is required to test netbsd.compat with structuredAttrs turned on once the setup hooks support it.
Tested netbsd.compat with and without structuredAttrs.
Tested netbsd.lorder with and without __structuredAttrs.
Tested openbsd.lorder with and without __structuredAttrs.
Couldn't test this, because freebsd.compat is failing with unrelated errors for me.
wolfgangwalther
requested review from
K900,
NickCao,
SuperSandro2000 and
ttuegel
as code owners
github-actions
bot
added
the
6.topic: qt/kde
|
xcbuild changes look fine. They match (more or less) what I’ve done in my Darwin refactor branch. Another good test case on Darwin is MoltenVK. Its scheme has spaces, which doesn’t work without structured attrs. Ignore the new SDK stuff, but this is what it should look like when it can use xcbuildHook: https://github.com/reckenrode/nixpkgs/blob/darwin-sdk-refactor/pkgs/os-specific/darwin/moltenvk/default.nix#L131-L142 |
ofborg
bot
added
10.rebuild-darwin-stdenv
|
Adding @artemist for the *bsd bits. Please feel free to add whomever you think else might be the right person(s) to review! |
philiptaron
left a comment
philiptaron
left a comment
There was a problem hiding this comment.
The changes to all but *BSD look quite straightforward to me.
|
Nothing looks super out of place with BSD, though I haven't tested it. I think @rhelmot has dealt with the setup hook more |
|
Barring any objections, I'd like to merge this in a day or less. |
6 participants
Description of changes
This is a second follow up to #318614, which had a lot more commits initially, similar to the first one in #335666. For context, please see those PRs.
For some of the commits in this PR, I was able to find some packages to test with/without structuredAttrs similar to the PRs before, but not all of them. The changes should be straight-forward by now anyway, using the other two PRs as reference.
After this PR, there are only a few more hooks left on my list, but I will open individual PRs for those later.
CC @emilazy @philiptaron @tie
Since the changed setup hooks won't trigger ofborg to mention the maintainers:
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.