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-modules/generated-packages.nix: fix 'lua' to propagate #56386

Merged
merged 2 commits into from Feb 26, 2019

Conversation

@dtzWill
Copy link
Contributor

dtzWill commented Feb 25, 2019

Otherwise 'lua' is from the argument populated by callPackage
which means it's whatever the default is.

(instead of the lua we're generating packages for!)

Motivation for this change

Without this, I was finding lua53Packages managed to pull lua 5.2 along
with which caused confusion/mismatches.

This can be observed by specifying luaPackages = lua53Packages;
in top-level/all-packages.nix for the awesome package,
and inspect the build log (or try awesome --version) to see
what version of lua it detects.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Otherwise 'lua' is from the argument populated by callPackage
which means it's whatever the default is.

(instead of the lua we're generating packages for!)
@dtzWill

This comment has been minimized.

Copy link
Contributor Author

dtzWill commented Feb 25, 2019

cc @teto -- this look correct to you?

@teto

This comment has been minimized.

Copy link
Contributor

teto commented Feb 26, 2019

yep looks good. In fact this might solve one other problem.

@dtzWill

This comment has been minimized.

Copy link
Contributor Author

dtzWill commented Feb 26, 2019

Great, here's hoping. It's a bit subtle-- honestly wasn't sure which would be used (argument vs with self).

Whoops I'll push a fix shortly to address this in the update script, gimme a min.

@teto

This comment has been minimized.

Copy link
Contributor

teto commented Feb 26, 2019

oops yeah, forgot about that xD

@dtzWill dtzWill merged commit b9a1a2a into NixOS:master Feb 26, 2019
10 checks passed
10 checks passed
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@dtzWill dtzWill deleted the dtzWill:fix/lua-propagate-the-right-lua branch Feb 26, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.