Skip to content

lua: actually fix longstanding bug in lua envHook causing relative module imports to stop working#295012

Merged
vcunat merged 1 commit intoNixOS:stagingfrom
lolbinarycat:lua-path-fix-real
Mar 12, 2024
Merged

lua: actually fix longstanding bug in lua envHook causing relative module imports to stop working#295012
vcunat merged 1 commit intoNixOS:stagingfrom
lolbinarycat:lua-path-fix-real

Conversation

@lolbinarycat
Copy link
Contributor

somehow, between all my testing, all the code review, and my code being copy-pasted into other people's PRs, noone noticed the glaring issue in the singular line of code i committed.

there was a missing negation. this has now been fixed.

related: #289135 and the associated reversion

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.

…dule imports to stop working

somehow, between all my testing, all the code review, and my code being copy-pasted into
other people's PRs, noone noticed the glaring issue in the singular line of code i committed.

there was a missing negation.  this has now been fixed.
@github-actions github-actions bot added the 6.topic: lua Lua is a powerful, efficient, lightweight, embeddable scripting language. label Mar 11, 2024
@lolbinarycat
Copy link
Contributor Author

@teto @vcunat

@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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Mar 11, 2024
@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one person. label Mar 11, 2024
@vcunat vcunat merged commit d6cd575 into NixOS:staging Mar 12, 2024
@vcunat
Copy link
Member

vcunat commented Mar 12, 2024

Looks OK at a glance. I also checked the packages reported previously.

@flokli
Copy link
Member

flokli commented Apr 1, 2024

It looks like this regressed again on staging-next somehow (2f73b69).

knot-resolver tests are not able to find http.request lua module, so its build fails. Could you maybe take a look?

@lolbinarycat
Copy link
Contributor Author

@Floki that's not a relative module, that's a system module. i believe that is related to #286822, not this.

@vcunat
Copy link
Member

vcunat commented Apr 1, 2024

Yes, reverting that PR fixed the regression for me. Anyway, it's discussed there.

@flokli
Copy link
Member

flokli commented Apr 1, 2024

alright, thanks. Sorry for the noise!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants