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: f45e8b3432ab
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: f06d8e0bf482
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Mar 4, 2019

  1. lua-modules/generated-packages.nix: fix 'lua' to propagate 

    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!)

(cherry picked from commit 2a1c7b1)
The error had e.g. an effect on `disabled` attributes being incorrect.
    @dtzWill @vcunat
    dtzWill authored and vcunat committed Mar 4, 2019
    Copy the full SHA
    a36be6d View commit details
    Browse the repository at this point in the history

  2. Revert "luaPackages.cqueues: move to generated" 

    This reverts commit c01fe37.
See the reverted commit on GitHub for discussion.  /cc PR #55305.

(cherry picked from commit 3e442fd)
    @vcunat
    vcunat committed Mar 4, 2019
    Copy the full SHA
    f06d8e0 View commit details
    Browse the repository at this point in the history