Skip to content

treewide: handle *Phases variables __structuredAttrs-agnostically (round 2)#352709

Merged
wolfgangwalther merged 7 commits intoNixOS:stagingfrom
ShamrockLee:structured-attrs-phases-2
Dec 16, 2024
Merged

treewide: handle *Phases variables __structuredAttrs-agnostically (round 2)#352709
wolfgangwalther merged 7 commits intoNixOS:stagingfrom
ShamrockLee:structured-attrs-phases-2

Conversation

@ShamrockLee
Copy link
Contributor

@ShamrockLee ShamrockLee commented Oct 31, 2024

This PR clears the remaining non-__structuredAttrs-agnostic appending to the *Phase list not caught by #339117.

For the "insert the new phase before certain phase" operation, this commit adds a new Bash function replaceElement to setup.sh to provide a more graceful solution to the string-replacement hack in #339117 and previous implementations. (Previous discussion: #339117 (comment)).

Cc: @philiptaron @wolfgangwalther

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: stdenv Standard environment 6.topic: dotnet Language: .NET labels Oct 31, 2024
@ShamrockLee ShamrockLee force-pushed the structured-attrs-phases-2 branch from 160b7f1 to 292a749 Compare October 31, 2024 20:57
wolfgangwalther
wolfgangwalther reviewed Oct 31, 2024
View reviewed changes
@ShamrockLee ShamrockLee mentioned this pull request Oct 31, 2024
Open
4 tasks
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Nov 1, 2024
wolfgangwalther
wolfgangwalther requested changes Nov 2, 2024
View reviewed changes
Copy link
Contributor

@wolfgangwalther wolfgangwalther left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should not introduce any new helper to stdenv here, but instead fix the 4 cases "properly" as suggested in the other comments. This will remove all those hacks depending on order of the preXPhases.

@ShamrockLee ShamrockLee mentioned this pull request Nov 3, 2024
Merged
13 tasks
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 10, 2024
@wolfgangwalther wolfgangwalther mentioned this pull request Nov 30, 2024
Merged
13 tasks
@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Nov 30, 2024

I think we should not introduce any new helper to stdenv here, but instead fix the 4 cases "properly" as suggested in the other comments. This will remove all those hacks depending on order of the preXPhases.

I opened #360450 to address those special cases. If we do this, then we don't need introduce any new helpers here.

@ShamrockLee ShamrockLee force-pushed the structured-attrs-phases-2 branch from 292a749 to 2db8439 Compare December 16, 2024 17:34
@github-actions github-actions bot removed 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: stdenv Standard environment labels Dec 16, 2024
@ShamrockLee
Copy link
Contributor Author

ShamrockLee commented Dec 16, 2024

I opened #360450 to address those special cases. If we do this, then we don't need introduce any new helpers here.

@wolfgangwalther Thank you for fixing them. I dropped the commits already adjusted by #360450.

@github-actions github-actions bot added 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. and removed 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Dec 16, 2024
@ShamrockLee
Copy link
Contributor Author

ShamrockLee commented Dec 16, 2024

There are still a lot of rebuilds. I'll re-target this feature branch to staging.

@ShamrockLee ShamrockLee force-pushed the structured-attrs-phases-2 branch from 2db8439 to 01dc95c Compare December 16, 2024 17:46
@ShamrockLee ShamrockLee changed the base branch from master to staging December 16, 2024 17:46
@ShamrockLee ShamrockLee removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 16, 2024
@ShamrockLee
Copy link
Contributor Author

ShamrockLee commented Dec 16, 2024

@ofborg build tests.devShellTools.nixos
@ofborg build tests.dotnet
@ofborg build tests.testers
@ofborg build tests.trivial-builders.references
@ofborg build tests.vim

@ShamrockLee
Copy link
Contributor Author

ShamrockLee commented Dec 16, 2024

The build logs don't show why OfBorg failed to build the package tests, and I cannot reproduce such failures on my laptop (all built successfully).

@wolfgangwalther
Copy link
Contributor

wolfgangwalther commented Dec 16, 2024

The build logs don't show why OfBorg failed to build the package tests, and I cannot reproduce such failures on my laptop (all built successfully).

I looked through the failures / logs. Some seem to be timeouts, some failing dependencies, e.g. diffoscope (for which I had observed build failures on staging lately, too).

None of that seems related to the changes here.

@wolfgangwalther wolfgangwalther merged commit 9d243b6 into NixOS:staging Dec 16, 2024
13 of 20 checks passed
@nixpkgs-ci nixpkgs-ci bot mentioned this pull request Jan 10, 2025
Closed
1 task
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 10, 2025

Successfully created backport PR for staging-24.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wolfgangwalther wolfgangwalther wolfgangwalther approved these changes

@Artturin Artturin Awaiting requested review from Artturin

@corngood corngood Awaiting requested review from corngood

@emilazy emilazy Awaiting requested review from emilazy

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@K900 K900 Awaiting requested review from K900

@natsukium natsukium Awaiting requested review from natsukium

@NickCao NickCao Awaiting requested review from NickCao

@philiptaron philiptaron Awaiting requested review from philiptaron

@reckenrode reckenrode Awaiting requested review from reckenrode

@RossComputerGuy RossComputerGuy Awaiting requested review from RossComputerGuy

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@ttuegel ttuegel Awaiting requested review from ttuegel

Assignees

No one assigned

Labels

6.topic: dotnet Language: .NET 6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@ShamrockLee @wolfgangwalther @emilazy @wegank