Commit graph

171 commits

Author SHA1 Message Date
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
John Ericson
d0d5136cce Merge remote-tracking branch 'upstream/master' into wrapper-pname-support 2019-11-24 17:25:07 +00:00
John Ericson
9b090ccbca treewide: Get rid of most parseDrvName without breaking compat
That is because this commit should be merged to both master and
release-19.09.
2019-11-24 17:22:28 +00:00
Doron Behar
c32ecb4b0e luaPackages.pulseaudio: 0.1 -> 0.2 2019-11-15 05:24:19 +09:00
Doron Behar
922de4f4b5 luaPackages.pulseaudio: init at 0.1 2019-10-04 21:19:19 +02:00
Alexei Robyn
c62337d9c7 lua*Packages: Consolidate separate setup hooks together
- Lua packages now consistently use LUA_PATH/LUA_CPATH rather than a mix
  of those and NIX_LUA_PATH/NIX_LUA_CPATH
- Lua libraries are now consistently only added to the search path
variables if:
    1) The library actually has a corresponding directory to search
    2) The library is not already present in the search path
  This should help prevent the search paths from growing overly large
- Fixed bugs in some path helpers
- Changed the affected shell script indentation to 2 spaces; nixpkgs
  shell scripts are inconsistently split between 2 and 4 space
  indentation, but 2 matches better with the Nix expressions, so IMO it
  makes more sense
2019-09-01 17:42:20 +02:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Matthieu Coudron
c33153bf13
Merge pull request #63108 from Shados/lua-packaging-improvements-pr
Lua/luarocks packaging improvements
2019-06-19 14:23:31 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Alexei Robyn
274715cbc3 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)
2019-06-14 13:17:15 +10:00
Izorkin
cf976dd9bd luaPackages.luadbi: 0.7.1 -> 0.7.2 2019-06-11 22:55:11 +09:00
Matthieu Coudron
128ca15808 luaPackages.lpeg: 1.0.1 -> 1.0.2
and move to generated
2019-06-07 21:17:01 +09:00
Matthieu Coudron
2d77d620ce luaPackages.luaposix: move to generated 2019-06-06 14:39:14 +09:00
Matthieu Coudron
6fe580e30b luaPackages.mpack: removed duplicate manual package 2019-06-06 14:39:14 +09:00
Matthieu Coudron
dbf4c8051a luaPackages.lua-zlib: 1.1 -> 1.2
Renamed from luazlib to luarocks name lua-zlib.
Move to generated.
2019-06-06 12:12:15 +09:00
Matthieu Coudron
704358dcb5 luaPackages.luazip: 2007-10-30 -> 1.2.7 2019-06-05 16:20:27 +09:00
Matthieu Coudron
62d4e044e7 luaPackages.cjson: move to generated 2019-06-05 15:23:42 +09:00
Vladimír Čunát
7043d23093
lua*Packages.luasec: 0.6 -> 0.8
https://github.com/brunoos/luasec/blob/luasec-0.8/CHANGELOG
2019-05-21 17:15:11 +02:00
Vladimír Čunát
06b043013e
lua*Packages.luaossl: 20170903 -> 20181207
I'm in particular interested in :setCertificateChain()
2019-05-21 17:11:22 +02:00
Vladimír Čunát
110fb944f1
lua*Packages.http: 0.3 -> 0.4 (and generate)
One bugfix patch is included - merged upstream but not released yet.
knot-resolver wrapper would need to add binaryheap explicitly,
so it's migrated to the automatic LUA path discovery instead.
2019-05-01 11:28:47 +02:00
Vladimír Čunát
90f8161745
lua*Packages.luasec: improve paths
Test case that should execute without an error:
echo "require('ssl.https')" | env NIX_PATH=nixpkgs=$(pwd) \
      nix-shell --pure -p lua -p lua.pkgs.luasec --run lua
2019-05-01 11:08:08 +02:00
Vladimír Čunát
10237c8584
lua*Packages.compat53: improve paths
Test case that should execute without an error:
echo "require('compat53')" | env NIX_PATH=nixpkgs=$(pwd) \
  nix-shell --pure -p lua -p lua.pkgs.compat53 --run lua
2019-05-01 10:58:47 +02:00
Michael Raskin
eda2463c4d
Merge pull request #57945 from teto/lua/std_rename
lua: std._debug / std.normalize rename + move to automated.
2019-04-27 06:30:48 +00:00
Vladimír Čunát
5b316ed476
lua*Packages.cqueues: fix internal version number
It's a workaround for now, until we know more.  See upstream ticket.
2019-04-23 10:54:30 +02:00
Matthieu Coudron
e195a37fd9 luaPackages: rename std._debug to std__debug
Similarly rename std.normalize to std_normalize.
Having a dot in the name prevents some changes to the lua infrastructure,
for instance passing attribute names { std._debug }: to a function would fail with
`syntax error, unexpected ',', expecting '.' or '=',`
2019-04-14 16:38:23 +09:00
Michael Raskin
bd616c0cd3
Merge pull request #57010 from teto/luarocks_update
Luarocks update
2019-03-07 10:52:56 +00:00
Matthieu Coudron
ed7818219a
lua: run postConfigure hook for rock and rockspec
it was previously run only for src.rock
2019-03-07 10:34:01 +00:00
Matthieu Coudron
b93ccb7136
lua: add isLua53 2019-03-07 10:17:44 +00:00
Matthieu Coudron
64801cc153 lua-packages.nix:remove unused 'overrides' setting
This was leftover from early implementations.
The overrides are passed via packageOverrides in lua-modules/default.nix
2019-03-07 17:43:07 +09:00
Vladimír Čunát
3e442fd0f9
Revert "luaPackages.cqueues: move to generated"
This reverts commit c01fe375ca.
See the reverted commit on GitHub for discussion.  /cc PR #55305.
2019-03-04 20:34:07 +01:00
Matthieu Coudron
0cb3ee3bde luaPackages.lua-iconv: move to generated 2019-02-13 14:13:39 +09:00
Matthieu Coudron
c84a431624 luaPackages.lpty: 1.2.1 -> 1.2.2 generated 2019-02-13 14:13:01 +09:00
Matthieu Coudron
ce63fd4381 luaPackages.luabitop: generated 2019-02-13 14:12:44 +09:00
Matthieu Coudron
c789b88cdd luaPackages.luacheck: 0.20 -> 0.23 generated 2019-02-13 14:11:14 +09:00
Matthieu Coudron
421110ae36 luaPackages.luaevent: 0.4.4 -> 0.4.6 generated 2019-02-13 14:10:35 +09:00
Matthieu Coudron
71b2e1f554 luaPackages.lgi: move to generated 2019-02-12 11:47:54 +09:00
Matthieu Coudron
c01fe375ca luaPackages.cqueues: move to generated 2019-02-12 11:47:54 +09:00
Matthieu Coudron
84d4faf8d5 luaPackages.basexx: move to generated 2019-02-12 11:47:53 +09:00
Matthieu Coudron
582fa48e6f luaPackages.fifo: move to generated 2019-02-12 11:47:53 +09:00
Matthieu Coudron
f0269de17f luaPackages.lpeg_patterns: move to generated 2019-02-12 11:47:53 +09:00
Matthieu Coudron
aaeaa6d1c6 Add checkPhase for neovim (disabled by default) (#55266)
* neovim-unwrapped: now use lua environments

* mpv: use lua environments

* luaPackages.inspect: init at 3.1.1-0

* luaPackages.lgi: mark as a lua module

* luaPackages.vicious: mark as a lua module
2019-02-05 15:00:19 +00:00
Matthieu Coudron
2ba891788b Lua generate nix packages from luarocks (#54978)
* lua: generate packages from luarocks

* luarocks-nix: update

* removed packages already available in nixpkgs

* adressing reviews

update script can now accept another csv file as input with -c

* Remove obsolete comment
2019-02-04 11:30:58 +00:00
Matthieu Coudron
c4519cf8a6 lua: add withPackages function (#54460)
* lua: add withPackages function

First step towards more automation similar to the haskell backend.
Follow up of https://github.com/NixOS/nixpkgs/pull/33903
2019-01-30 14:13:15 +00:00
Matthieu Coudron
15a8719d40 luarocks-nix: init
luarocks-nix is a fork of luarocks that adds a "nix" command capable of
converting luarocks package descriptions into nix derivations (though nixpkgs is
still missing the lua infrastructure).
2019-01-22 16:52:43 +09:00
Izorkin
2a2294298f luaPackages.luadbi: 0.6 -> 0.7.1 2019-01-04 10:14:12 +03:00
Jan Tojnar
a51a99c690
gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
Robin Gloster
9111012f7f
luaPackages.luasocket: fix cross 2018-11-29 04:12:10 +01:00
Jörg Thalheim
a8413d816a luaPackages.luadbi: 0.5 -> 0.6 (#47156)
Switch to maintained fork that is compatible with lua5.2/lua5.3.
This package was tested with prosody.
2018-09-22 22:27:35 +02:00
Vladimír Čunát
7a605f3c78
lua*Packages.http: init at 0.2 2018-07-30 17:35:20 +02:00
Vladimír Čunát
40140997cb
lua*Packages.basexx: init at 0.4.0 2018-07-30 17:26:48 +02:00