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: 56cc1e3aca3d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: c33153bf1395
Choose a head ref
  • 10 commits
  • 18 files changed
  • 2 contributors

Commits on Jun 13, 2019

  1. Copy the full SHA
    5a249ec View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    b7e6161 View commit details
    Browse the repository at this point in the history
  3. update-luarocks: Several improvements

    Changes:
    - Fetches rocks and builds Nix expressions for them in parallel
    - Passes 'maintainers' list to luarocks-nix
    - Constructs the luarocks argument list more cleanly, by using an
      indexed array
    - Made indentation consistent
    Shados committed Jun 13, 2019
    Copy the full SHA
    46c6b27 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    00622f1 View commit details
    Browse the repository at this point in the history
  5. lua-modules: update generated-packages.nix

    Summary of resulting package updates:
    - bit32: init at 5.3.0-1 (same as current hand-written derivation)
    - busted: 2.0.rc12-1 -> 2.0.rc13-0
    - compat53: init at 0.7-1 (same as current hand-written derivation)
    - cqueues: init at 20171014-0 (same as current hand-written derivation)
    - cyrussasl: init at 1.1.0-1 (same as current hand-written derivation)
    - lrexlib-pcre: init at 2.9.0-1 (vs 2.8.0 in current hand-written
      lrexlib derivation)
    - luadbi and backends (luadbi-{mysql,postgresql,sqlite3}): init at
      0.7.2-1 (vs 0.7.1 in current hand-written derivation)
    - luaexpat: init at 1.3.3-1 (vs 1.3.0 in current hand-written
      derivation)
    - luafilesystem: init at 1.7.0-2 (same as current hand-written
      derivation)
    - luaossl: init at 20190612-0 (vs 20181207 in current hand-written
      derivation)
    - luasec: init at 0.8-1 (same as current hand-written derivation)
    - luasocket: init at 3.0rc1-2 (same as current hand-written derivation)
    - luasql-sqlite3: init at 2.4.0-1 (vs 2.3.0 in current hand-written
      luasqlite3 derivation)
    - rapidjson: 0.5.1-1 -> 0.5.2-1
    - stdlib: init at 41.2.2-1 (vs 41.2.1 in current hand-written
      derivation)
    Shados committed Jun 13, 2019
    Copy the full SHA
    2792dc8 View commit details
    Browse the repository at this point in the history
  6. luarocks: 3.0.4 -> 3.1.3

    The newer version silences some superfluous warnings we were previously
    getting in Nix builds using luarocks.
    Shados committed Jun 13, 2019
    Copy the full SHA
    f8efece View commit details
    Browse the repository at this point in the history
  7. buildLuarocksPackage: Several improvements

    Summary of main changes:
    - Now makes use of luarocks dependency resolution (builds will fail if
      rockspec dependencies are unmet)
    - Renamed argument `external_deps` -> `exernalDeps` and add
      functionality to handle external dependencies that are multiple-output
      derivations
    - Added an `extraVariables` argument for appending to the contents of
      luarocks config `variables` table
    - The `rockspecFilename` argument default is now actually used
    - The `disabled` argument can now be overriden with a less-restrictive
      check, as it now just sets `meta.broken` instead of throwing an error
      during eval
    - The `doCheck` argument is now actually honored if set to `true`
    Shados committed Jun 13, 2019
    Copy the full SHA
    8eabbb3 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2019

  1. luaPackages: Replace all rockspec packages with generated ones

    luaPackages replaced by generated ones:
    - bit32
    - compat53
    - cqueues
    - luacyrussasl -> cyrussasl (luarocks name)
    - luaexpat
    - luadbi -> luadbi front-end module + separate backend modules
      luadbi-{mysql,postgresql,sqlite3}
    - luafilesystem
    - luaossl
    - luasec
    - luasocket
    - luastdlib -> stdlib (luarocks name)
    - lrexlib -> lrexlib-pcre (we already have lrexlib-gnu and
      lrexlib-posix, lrexlib-pcre however appears to be the variant used in
      mudlet, which is the only current dep in nixpkgs)
    - luasqlite -> luasql-sqlite3 (luarocks name)
    - lfs -> luafilesytem (we literally had two manually written
      luafilesystem expressions, under different names)
    
    Changes and additions to overrides to generated luarocks packgaes,
    including:
    - busted: Install bash completions along with the zsh ones
    - cqueues:
        - Perform minor surgery on the rockspec to allow using a single
          rockspec to build for all supported Lua versions
        - Add a patch by @vcunat to work around a build issue
    - luuid: Wrote a tiny patch to allow for Lua 5.1/Luajit compatibility
    - General changes:
        - Sorted the packages
        - Attempted to make the formatting consistent
        - Preferenced `.override` instead of `.overrideAttrs` wherever
          possible
    
    Minor changes to other packages to adjust for the Lua package changes:
    - luakit expression simplified
    - prosody expression simplified; but users will now need to specify the
      luadbi backend module they intend to use in withExtraLibs
    - knot-resolver inputs correctd
    - mudlet inputs corrected (although this package was and should still be
      broken)
    Shados committed Jun 14, 2019
    Copy the full SHA
    274715c View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    671e53a View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2019

  1. Merge pull request #63108 from Shados/lua-packaging-improvements-pr

    Lua/luarocks packaging improvements
    teto committed Jun 19, 2019
    Copy the full SHA
    c33153b View commit details
    Browse the repository at this point in the history