Commit Graph

213 Commits

Author SHA1 Message Date
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
Vladimír Čunát
597a5936d3
lua*Packages.compat53: init at 0.7
The manual compilation is weird, but there's only a rockspec upstream,
and I don't know how to use that well inside the nix build.
2018-07-30 17:08:48 +02:00
Vladimír Čunát
837a9a4677
lua*Packages.luaoss: init at 20170903 2018-07-30 16:40:41 +02:00
Vladimír Čunát
05df847150
fixup! lua*Packages.cqueues: init at 20171014 2018-07-30 16:40:01 +02:00
Vladimír Čunát
4aa324ac5a
lua*Packages.lpeg_patterns: init at 0.5 2018-07-30 16:31:40 +02:00
Vladimír Čunát
3a808133d3
lua*Packages.fifo: init at 0.2 2018-07-30 16:23:51 +02:00
Vladimír Čunát
112021b166
lua*Packages.cqueues: init at 20171014 2018-07-30 16:09:01 +02:00
Vladimír Čunát
bddcd35e1d
Merge #43141: lua-5.3 and lpeg updates 2018-07-21 23:05:44 +02:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth
87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
Vladimír Čunát
bfc123803d
lua*Packages.lfs: init at 1.7.0.2 2018-07-08 09:19:43 +02:00
Philipp Gesang
0b30f69406
lua-packages: update lpeg 0.12 -> 1.0.1
Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
2018-07-07 16:21:19 +02:00
Philipp Gesang
cc5d281035
lua-packages: define lua53Packages
Set up lua packages for the v5.3.x interpreter.

Blacklist the set of lua-packages (luabitop, luaexpat, luazip,
luasqlite3) whose compilation fails against 5.3.4. The rest are at least
building.

Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
2018-07-07 16:10:31 +02:00
Orivej Desh
1e97008bb8 luaPackages.mpack: fix build after #28029 2018-05-29 15:06:38 +00:00
John Ericson
cf06e42d1c Merge remote-tracking branch 'upstream/master' into staging 2018-05-03 16:35:36 -04:00
Stefan Wiehler
2fcf50a323 luafilesystem: 1.6.3 -> 1.7.0 2018-04-30 10:59:57 +02:00
Jan Malakhovski
7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Ricardo M. Correia
475c4e08ea luaPackages.mpack: fix hash
The actual revision was changed back in November 2007 with commit
b7ed086650 but the hash wasn't updated.
2018-04-13 20:54:31 +02:00
Robin Gloster
76ea0e1b2e
Merge pull request #32960 from florianjacob/prosody-0.10
Prosody 0.10.0
2018-03-22 14:12:57 +01:00
Ryan Mulligan
e38d28840d lua51Packages.lgi: 0.9.1 -> 0.9.2
Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.2 with grep in /nix/store/q6lcshhmi0dn8ndz2jz9nlircfww4fcm-lgi-0.9.2
- directory tree listing: https://gist.github.com/48d4d638fbd1169b1c96b7e506202b93
2018-03-20 09:53:14 -07:00
Florian Jacob
0c74665bad luaevent: 0.4.3 -> 0.4.4 2018-03-12 20:18:34 +01:00
Luka Blaskovic
13c8e0194d luaPackages.bit32: init at 5.3.0
fixes #35581
2018-03-09 19:32:28 +00:00
Luka Blaskovic
b86c7469a6 luaposix: 33.4.0 -> 34.0.4 2018-03-09 19:32:06 +00:00
Luka Blaskovic
73ec2c29d4 luaPackages.std.normalize: init at 2.0.1 2018-03-09 19:32:06 +00:00
Luka Blaskovic
2f0ff59d89 luaPackages.std._debug: init at 1.0 2018-03-09 19:32:06 +00:00
Luka Blaskovic
7b7607382d lua packages: propagate libs with a setupHook
The LUA_PATH and LUA_CPATH variables are needed to load libraries.
This setupHook exports them to the environment.
2018-02-25 21:24:47 +00:00
Uli Schlachter
718552eca4 lgi: Fix cairo bindings search path
Since commit e44038bcca, cairo-1.0.typelib contains an absolute
path to cairo in the nix store so that no $LD_LIBRARY_PATH hacks are
needed. However, this did not yet work for lgi, because lgi does
dlopen("libcairo.so.2") without a full path, too.

To make this work, this commit ensures that lgi first uses
gobject-introspection to load libcairo. This uses the full path provided
by the typelib. Afterwards, dlopen("libcairo.so.2") does not hit the
filesystem anymore since the library is already loaded.

This commit adds a patch that reorders some code in lgi's cairo
initialisation. Previously, this started with core.module('cairo', 2),
which is where the dlopen happens. Now, this code is moved down and
instead core.gi.cairo.resolve is used to load the definitions of some
enums first. This part of the code goes through gobject-introspection
and causes libcairo to be loaded.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2018-02-04 11:23:35 +01:00
Yegor Timoshenko
506c89c30a maintainers: remove mornfall from packages 2018-01-17 05:17:33 +00:00
Robin Gloster
fe437d70ec luaPackages.luadbi: libmysql -> connector-c 2017-12-29 02:18:35 +01:00
José Romildo Malaquias
4cc9886d79 vicious: 2.3.0 -> 2.3.1 2017-12-22 07:06:27 -02:00
Orivej Desh
54aafd15b2 luaPackages.luadbi: fix darwin build 2017-12-09 11:54:40 +00:00
Orivej Desh
40950f6a2d
Merge pull request #31006 from florianjacob/prosody
Improvements for Prosody
2017-12-09 09:19:24 +00:00
Daiderd Jordan
b7ed086650 lua-mpack: fix darwin build 2017-11-29 03:01:15 +00:00
Joerg Thalheim
88dfc0333a luaPackages.vicious: 2.2.0 -> 2.3.0
cc @makefu
2017-11-25 09:36:27 +00:00
Rok Garbas
7dce6c88d2 neovim: 0.2.0 -> 0.2.1
* neovimLibvterm: 5a748f97 -> 4ca7ebf7
* neovim ruby: 0.5.0 -> 0.5.1
* pythonPackages.neovim: 0.1.13 -> 0.2.0
* libmpack: 1.0.3-rev80bd55ea6 -> 1.0.5
* luaPackages.mpack: switched to new source location, 1.0.7_ef025224a7
* only one set of lua packages, switched to luajit
2017-11-15 01:21:46 +01:00
Markus Kohlhase
c84cb83e40 luabitop: remove flosse from the list of maintainers 2017-11-06 16:00:09 +01:00
Satoshi Shishiku
7d0b910361 luaPackages.luasocket: compile with unix support 2017-11-01 13:37:59 +01:00
Satoshi Shishiku
dcd9969f5b luacyrussasl: init at 1.1.0 2017-11-01 13:37:59 +01:00
Satoshi Shishiku
36995b788e luaPackages.lpty: 1.1.1 -> 1.2.1 2017-11-01 13:37:57 +01:00
Satoshi Shishiku
fbe0310ea4 luaPackages.luafilesystem: 1.6.2 -> 1.6.3 2017-11-01 13:37:56 +01:00
Satoshi Shishiku
309c74fd84 luaPackages.luaexpat: don't set isLibrary
This flag seems to be useless.
2017-11-01 13:37:56 +01:00
Satoshi Shishiku
ec07abf316 luaPackages.luadbi: init at 0.5 2017-11-01 13:37:55 +01:00
Vladimír Čunát
681c6f99a8
luaPackages.mpack: fix sourceRoot
Uncovered by c3255fe8ec.
2017-10-31 23:47:16 +01:00
Orivej Desh
1fee6e149b luastdlib: 41.2.0 -> 41.2.1 2017-10-31 10:38:12 +00:00
xd1le
acc076d51f luaPackages: various cosmetic fixes
These involve:

- Formatting and spacing.
- Switching to using fetchFromGitHub where possible.
- Adding missing meta attributes.
  - Correcting license values or adding missing license values.
  - Adding vyp as maintainer for unmaintained packages.

None of these changes should affect the build result.

A different revision is used for luasqlite3, however, the source code
between these revisions is actually the same. (And the advantage is that
the new revision is a tagged release.)
2017-10-13 14:48:17 +11:00
xd1le
0946e30470 luaPackages: use consistent multiline strings for luafilsystem and
luazlib
2017-10-13 14:46:51 +11:00
xd1le
b584c46623 luaPackages.luacheck: skip buildPhase 2017-10-10 02:51:05 +11:00
xd1le
152d294479 luajitPackages: disable luaexpat, luazip and cjson as their builds fail 2017-10-10 02:51:05 +11:00
xd1le
b83c89b6b4 luajitPackages.mpack: disable with new isLuaJIT function insead of
marking it as broken
2017-10-10 02:51:05 +11:00
Orivej Desh
fda26c8476 Merge branch 'master' into staging
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
2017-10-02 00:22:12 +00:00
Richard Ipsum
cdd5176fe2 lua-iconv: init at 7 2017-09-30 14:03:14 +01:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Richard Ipsum
3d278be9ae luxio: Add maintainer 2017-09-24 15:59:43 +01:00
Joerg Thalheim
dd6691aa05 luxio: fix package build 2017-09-24 15:44:43 +01:00
Richard Ipsum
d42c062821 luxio: init at 13 2017-09-24 15:36:01 +01:00
John Ericson
531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
John Ericson
9f2e05662b treewide: Manually fix miscategorized autoreconfHook buildInputs
These are the ones with odd indentation my script will mess up on.
2017-09-21 15:49:53 -04:00
wisut hantanong
2131b0925a luaPackages.luacheck : init at 0.20.0 2017-08-24 17:11:27 +07:00
Richard Ipsum
32dec43701 lrexlib: 2.7.2 (broken) -> 2.8.0
The shared objects are not available in 'pcre.dev', so to build the rex_pcre.so
file we must specify 'pcre.out' as the directory to obtain shared objects
from, 'pcre.dev' is still needed for the header files though.
2017-07-08 23:09:32 +01:00