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

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

Merged
merged 1 commit into from
Mar 12, 2024

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.
@lolbinarycat
Copy link
Contributor Author

@teto @vcunat

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Mar 11, 2024
@vcunat vcunat merged commit d6cd575 into NixOS:staging Mar 12, 2024
28 checks passed
@vcunat
Copy link
Member

vcunat commented Mar 12, 2024

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

@flokli
Copy link
Contributor

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
Contributor

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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants