Skip to content

Conversation

@ghost
Copy link

@ghost ghost commented Apr 27, 2023

Description of changes

This commit improves readability in libgcc.nix by flattening the conditionals.

This commit has no effect on eval except that when langC && !enableLibGccOutput the empty string will be added as a preFixupLibGccPhase. This will cause a global rebuild on Darwin as well as all pkgsCross stdenvs, but improve maintainability and readability going forward.

This should wait until after the 23.05 branch-off.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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.

@ghost ghost requested a review from matthewbauer as a code owner April 27, 2023 21:43
This commit improves readability in libgcc.nix by flattening the
conditionals.

This commit has no effect on eval except that when `langC &&
!enableLibGccOutput` the empty string will be added as a
`preFixupLibGccPhase`.  This will cause a global rebuild on Darwin
as well as all pkgsCross stdenvs, but improve maintainability and
readability going forward.
@ofborg ofborg bot added 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 Apr 28, 2023
@ghost ghost marked this pull request as draft May 10, 2023 08:56
''
# no-op, to prevent the empty string from being removed from the environment.
+ ''
true
Copy link
Member

Choose a reason for hiding this comment

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

this causes the rebuilds

@ghost ghost closed this Jan 23, 2024
@ghost ghost deleted the pr/refactor/libgcc-dot-nix branch January 23, 2024 06:49
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant