Skip to content

buildLuarocksPackage: rework fixup phase#303176

Merged
teto merged 1 commit intoNixOS:stagingfrom
teto:teto/luarocks-rework-fixupphase
Apr 10, 2024
Merged

buildLuarocksPackage: rework fixup phase#303176
teto merged 1 commit intoNixOS:stagingfrom
teto:teto/luarocks-rework-fixupphase

Conversation

@teto
Copy link
Member

@teto teto commented Apr 10, 2024

I was working on lua tests, enabling nlua and I started overriding postFixup, which removed the default phase for build-luarocks-package so instead let's make it a proper phase.

Description of changes

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.05 Release Notes (or backporting 23.05 and 23.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.

Add a 👍 reaction to pull requests you find important.

@teto
buildLuarocksPackage: rework fixup phase
7f4a7ff 
I was working on lua tests, enabling nlua and I started overriding
postFixup, which removed the default phase for build-luarocks-package so
instead let's make it a proper phase.
@teto teto requested a review from mrcjkb April 10, 2024 18:41
mrcjkb
mrcjkb approved these changes Apr 10, 2024
View reviewed changes
@github-actions github-actions bot added the 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. label Apr 10, 2024
@cole-h
Copy link
Member

cole-h commented Apr 10, 2024

You'll want to rebase on the latest master -- there was an issue that broke ofborg's ability to evaluate Nixpkgs that has since been resolved. Sorry for the inconvenience!

@teto
Copy link
Member Author

teto commented Apr 10, 2024

@cole-h ty. since this targets staging, I will wait for the next master merge in staging.

@cole-h
Copy link
Member

cole-h commented Apr 10, 2024

It looks like this actually targets master. Was that a mistake? 😄

@teto
Copy link
Member Author

teto commented Apr 10, 2024

it is ! ty I almost triggered an apocalypse rebuild (I hope I would noticed the 5000 rebuilds once eval had passed xD)

@teto teto marked this pull request as draft April 10, 2024 20:31
@teto teto changed the base branch from master to staging April 10, 2024 20:31
@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: 2501-5000 This PR causes many rebuilds on Darwin and should 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: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Apr 10, 2024
@teto teto marked this pull request as ready for review April 10, 2024 22:29
@teto teto merged commit ddefcf2 into NixOS:staging Apr 10, 2024
@teto teto deleted the teto/luarocks-rework-fixupphase branch April 10, 2024 22:30
@vcunat
Copy link
Member

vcunat commented Apr 14, 2024

This commit broke lua*.tests.checkSetupHook (and knot-resolver); mentioned also in #300905 (comment)

@teto
Copy link
Member Author

teto commented Apr 14, 2024

hum I checked in pkgs/stdenv/generic/setup.sh and the standard phase does a lot of stuff, while the rest of the diff seems harmless, overriding the default one may have broken. I am on holiday, feel free to revert I will push something better later.

vcunat added a commit that referenced this pull request Apr 15, 2024
@vcunat
Revert #303176: "buildLuarocksPackage: rework fixup phase"
3bcf047 
This reverts commit ddefcf2.
Breakages need figuring out, reverting for now:
#303176 (comment)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@mrcjkb mrcjkb mrcjkb approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should 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: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@teto @cole-h @vcunat @mrcjkb