stdenv: wrap phase running actions of genericBuild into a function #230468
Conversation
This file contains 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
This commit adds `mips64el` to the `qemuArch` table.
The icon we were installing is an old one that should not be used these days: https://gitlab.com/wireshark/wireshark/-/merge_requests/10507 And the CMake build script already installs the desktop file and icons in a more proper location since 2.4.0: https://gitlab.com/wireshark/wireshark/-/commit/c27404655650a3648f576663d07394105fd5ef30
The `bootstrapTools.bootstrapTools` attribute, which *unpacks* the bootstrapFiles, lies about its `system`: https://github.com/NixOS/nixpkgs/blob/78963777a40a63333520c5c8f4567b4059b68c4d/pkgs/stdenv/linux/make-bootstrap-tools.nix#L236 Unfortunately because of this, when building `bootstrapTools.*`, Hydra will try to execute the cross-compiled bootstrapFiles' `busybox` on the wrong architecture, and fail. I originally submitted a fix for this, by filtering out the `.bootstrapTools` attribute, in NixOS#188339 Unfortunately my fix filtered at the wrong level of the attrset hierarchy, and neglected to filter the `test` attribute as well. This PR corrects those mistakes
ofborg
bot
added
10.rebuild-darwin-stdenv
thufschmitt
approved these changes
May 8, 2023
There was a problem hiding this comment.
That looks good (although I barely know anything about the intrinsics of stdenv, so don't trust me too much on that).
Wrt NixOS/nix#6202, note however that we probably wouldn't be able to use this for some time as we can't rely on people using a brand new nixpkgs
Failing Hydra build: https://hydra.nixos.org/build/215620971 Applying the patch that upgrades the vendored `pybind11` fixes the problem.
nixos/mosquitto: use networkd for tests
Provide a `runPhase` function which wraps the phase running action of genericBuild. The new function can be used as an interface by `nix develop`, i.e. `nix develop some#flake --build` may just call `runPhase build`, which makes its behavior more consistent with `nix build`. In preparation of fixing NixOS/nix#6202
kustomize: 4.5.4 -> 5.0.2
Co-authored-by: Sandro <[email protected]>
|
I've edited the commit name and the target branch, please check. |
Ninlives
changed the title
Ninlives
requested review from
romildo,
ulrikstrid,
zowoq,
figsoda,
jonringer,
teto,
RaitoBezarius,
a team,
tfc and
alyssais
as code owners
github-actions
bot
added
6.topic: nixos
|
Oops, I messed it up, sorry, will fix it later. |
|
This is why I said to read CONTRIBUTING.md as it has instructions. Please open a new pr to avoid spamming people |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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
Provide a
runPhasefunction which wraps the phase running action of genericBuild. The new function can be used as an interface bynix develop, i.e.nix develop some#flake --buildmay just callrunPhase build, which makes its behavior more consistent withnix build. In preparation of fixing NixOS/nix#6202Things done
Only tested with
nix build nixpkgs#hello(ca-derivationsby default when?). If someone has more free computing resources, please help me test the PR.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/)