Skip to content

Comments

buildRubyGem: do not override fixupPhase#323587

Merged
zimbatm merged 1 commit intoNixOS:stagingfrom
tie:ruby-do-not-override-fixup-phase
Jul 5, 2024
Merged

buildRubyGem: do not override fixupPhase#323587
zimbatm merged 1 commit intoNixOS:stagingfrom
tie:ruby-do-not-override-fixup-phase

Conversation

@tie
Copy link
Member

@tie tie commented Jun 30, 2024 •
edited
Loading

Description of changes

Oops, looks like we were overriding stdenv’s fixupPhase that runs fixupOutputHooks, including patchShebangsAuto.

See #270242 (comment)

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.

@tie
buildRubyGem: do not override fixupPhase
575c8e0 
Oops, looks like we were overriding stdenv’s fixupPhase that runs
fixupOutputHooks, including patchShebangsAuto.
@github-actions github-actions bot added the 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. label Jun 30, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Jun 30, 2024
@tie tie marked this pull request as ready for review June 30, 2024 14:37
@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Jun 30, 2024

I don't know if using preFixup or calling the hooks would be more correct here.

zimbatm
zimbatm approved these changes Jun 30, 2024
View reviewed changes
Copy link
Member

@zimbatm zimbatm left a comment

Choose a reason for hiding this comment

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

This fixes the issue

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Jun 30, 2024
@tie
Copy link
Member Author

tie commented Jul 1, 2024

I don't know if using preFixup or calling the hooks would be more correct here.

Or perhaps refactoring stdenv phases to avoid such footguns 😅

@tie
Copy link
Member Author

tie commented Jul 5, 2024

@SuperSandro2000, if there are not objections to the changes in the PR, perhaps we can merge this?

@zimbatm
Copy link
Member

zimbatm commented Jul 5, 2024

This is pragmatic and ok

@zimbatm zimbatm merged commit 4dec9be into NixOS:staging Jul 5, 2024
@tie tie deleted the ruby-do-not-override-fixup-phase branch July 5, 2024 20:21
@tie tie mentioned this pull request Jul 30, 2024
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zimbatm zimbatm zimbatm approved these changes

@nixy nixy Awaiting requested review from nixy

@manveru manveru Awaiting requested review from manveru

@Rucadi Rucadi Awaiting requested review from Rucadi

@anthonyroussel anthonyroussel Awaiting requested review from anthonyroussel

@tylerjl tylerjl Awaiting requested review from tylerjl

@SCOTT-HAMILTON SCOTT-HAMILTON Awaiting requested review from SCOTT-HAMILTON

Assignees

No one assigned

Labels

6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely 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: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@tie @SuperSandro2000 @zimbatm @wegank