Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

buildLuarocksPackage: rework fixup phase #303176

Merged
merged 1 commit into from
Apr 10, 2024

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.

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
@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
@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
26 checks passed
@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
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants