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

Commits on Mar 7, 2019

  1. luarocks: 2.4.4 -> 3.0.4 

    Some new features like test_dependencies/build_dependencies and flags ( --lua-versions)
that should make nix integration easier:
https://github.com/luarocks/luarocks/blob/master/CHANGELOG.md
    @teto
    teto committed Mar 7, 2019
    Copy the full SHA
    c37b892 View commit details
    Browse the repository at this point in the history

  2. luarocks-nix: bump to match luarocks 

    Also made changes to lua package generation system to account for packages like cqueues
that have one version per lua interpreter.
The csv file also accepts comments now.
    @teto
    teto committed Mar 7, 2019
    Copy the full SHA
    68a72f1 View commit details
    Browse the repository at this point in the history

  3. lua-packages.nix:remove unused 'overrides' setting 

    This was leftover from early implementations.
The overrides are passed via packageOverrides in lua-modules/default.nix
    @teto
    teto committed Mar 7, 2019
    Copy the full SHA
    64801cc View commit details
    Browse the repository at this point in the history

  4. Merge pull request #57010 from teto/luarocks_update 

    Luarocks update
    @7c6f434c
    7c6f434c committed Mar 7, 2019
    Copy the full SHA
    bd616c0 View commit details
    Browse the repository at this point in the history