Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 2b66f562e9f2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 505dcb3b7328
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 23, 2019

  1. lua wrapper: Fix bash error 

    Recently, we made it harder for external code to use some stdenv-only bash
variables by unsetting them in [1] But Lua's `withPackages` was sourcing some
setup hooks in [2], which required those bash variables.

I say great! We caught something bad: Lua should use normal dependencies, even
though that is harder with `buildEnv`. Now it works that way, and everything is
fine.

[1]: https://github.com/NixOS/nixpkgs/blob/9d3911f806034197bb7ace586cc3696ffce7f447/pkgs/stdenv/generic/setup.sh#L574-L578

[2]: https://github.com/NixOS/nixpkgs/blob/9d3911f806034197bb7ace586cc3696ffce7f447/pkgs/development/interpreters/lua-5/wrapper.nix#L23-L27

CC @matthewbauer
    @Ericson2314
    Ericson2314 committed Nov 23, 2019
    Copy the full SHA
    a610a38 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #73946 from Ericson2314/fix-lua-env 

    lua wrapper: Fix bash error
    @Ericson2314
    Ericson2314 committed Nov 23, 2019
    Copy the full SHA
    505dcb3 View commit details
    Browse the repository at this point in the history