Skip to content

gnu-config: use the unpackPhase, so .overrideAttrs(_:{patches=...}) works#249088

Merged
vcunat merged 2 commits intostagingfrom
unknown repository
Aug 20, 2023
Merged

gnu-config: use the unpackPhase, so .overrideAttrs(_:{patches=...}) works#249088
vcunat merged 2 commits intostagingfrom
unknown repository

Conversation

@ghost
Copy link
Copy Markdown

@ghost ghost commented Aug 14, 2023

Description of changes

Prior to this PR, gnu-config did its unpacking in the buildPhase, which mean that .overrideAttrs(_: { patches = ... }) couldn't be used totest out patches to gnu-config.

This PR fixes that.

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.11 Release Notes (or backporting 23.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.

@ghost ghost requested a review from sternenseemann August 14, 2023 09:57
@ghost ghost marked this pull request as ready for review August 14, 2023 09:57
@sternenseemann
Copy link
Copy Markdown
Member

Nit: would be .overrideAttrs (_: { patches = …; }).

@ofborg ofborg bot added the 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. label Aug 14, 2023
@ofborg ofborg bot requested review from dezgeg and emilytrau August 14, 2023 12:13
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 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 Aug 14, 2023
@ghost ghost changed the title gnu-config: use the unpackPhase, so .override({patches=...}) works gnu-config: use the unpackPhase, so .overrideAttrs(_:{patches=...}) works Aug 14, 2023
@ghost
Copy link
Copy Markdown
Author

ghost commented Aug 14, 2023

Fixed commit message.

Adam Joseph added 2 commits August 16, 2023 05:12
…orks

Prior to this PR, gnu-config did its unpacking in the `buildPhase`,
which mean that `.overrideAttrs(_:{ patches = ... })` couldn't be used to
test out patches to `gnu-config`.

This PR fixes that.
@vcunat vcunat merged commit 53db8a2 into NixOS:staging Aug 20, 2023
@ghost ghost deleted the pr/gnu-config/use-phases-properly branch August 21, 2023 04:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 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.

2 participants