Commit graph

151 commits

Author SHA1 Message Date
Vladimír Čunát 1cb40bdf08
Revert "lua*Packages.cqueues: fixup darwin build"
This reverts commit 47ad7d3131.
The fix isn't needed after the update contained in PR #89632.
2020-06-07 10:37:35 +02:00
Luka Blaskovic bd400bd006 lyaml: init at 6.2.5-1, update all generated packages 2020-06-06 18:45:57 +02:00
Matthieu Coudron 9a3d12e2ab luaPackages.mpack: use system mpack
the luarocks package uses the builtin command and discards the Makefile.
While using the makefile one needs to set some more flags.
2020-04-26 21:38:26 +02:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Daiderd Jordan 220636999b
Revert "luaPackages.luv: 1.30.0-0 -> 1.34.1-1"
This reverts commit eaa4728411.

With 81461cff5f luv also needs to be
downgraded until luarocks can be updated to 3.3.1 again.

Fixes #82727
2020-03-27 22:19:25 +01:00
Matthieu Coudron 7f821b3efc
Merge pull request #81067 from teto/lua_fix
- introduce a default checkPhase for lua (disabled by default)
- dont apply patchShebangs on the whole lua package; hopefulyl it doesnt break stuff
2020-02-27 11:01:30 +01:00
Doron Behar ca35318508 luaPackages.nvim-client: 0.2.0-1 -> 0.2.2-1 2020-02-26 15:47:54 +01:00
Matthieu Coudron 6eeb434b33 buildLuarocksPackage: extraVariables is now an attrset 2020-02-26 01:14:29 +01:00
Michael Lingelbach eaa4728411 luaPackages.luv: 1.30.0-0 -> 1.34.1-1 2020-02-17 19:34:55 +01:00
Mario Rodas 7d64380b6b
luaPackages.cosmo: init at 16.06.04-1 2020-02-11 16:18:19 +03:00
Mario Rodas 0b2a15fddd
luaPackages.cassowary: init at 2.2-1 2020-02-11 16:18:19 +03:00
Silvan Mosberger 80a2740991
Merge pull request #78265 from Synthetica9/https-homepages
treewide: fix redirected urls
2020-01-27 15:00:53 +01:00
Matthieu Coudron 84a2134baa luaPackages.vstruct: init at 2.0.2-1 2020-01-25 19:39:28 +01:00
Matthieu Coudron a032a3ad90 luaPackages.luarepl: init at 0.9-1 2020-01-25 19:39:28 +01:00
Matthieu Coudron 460224d4cd luaPackages.luaepnf: init at 0.3-1 2020-01-25 19:39:28 +01:00
Matthieu Coudron bc07d117f2 luaPackages.linenoise: init at 0.9-1 2020-01-24 21:23:08 +01:00
Matthieu Coudron 5365e3650d luaPackages.digestif: scm1 -> 0.2-1
Now it's a released package so no need to specify the manifest anymore.
2020-01-24 21:23:08 +01:00
Patrick Hilhorst 593e11fd94
treewide: fix redirected urls
According to https://repology.org/repository/nix_unstable/problems, we have a
lot of packages that have http links that redirect to https as their homepage.
This commit updates all these packages to use the https links as their
homepage.

The following script was used to make these updates:

```

curl https://repology.org/api/v1/repository/nix_unstable/problems \
    | jq '.[] | .problem' -r \
    | rg 'Homepage link "(.+)" is a permanent redirect to "(.+)" and should be updated' --replace 's@$1@$2@' \
    | sort | uniq > script.sed

find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```
2020-01-22 11:26:22 +01:00
Merijn Broeren 133103d709
treewide: replace make/build/configure/patchFlags with nix lists 2019-12-30 12:58:11 +01:00
edef a9d4cba9eb luaPackages.lgi: refer to unaliased gobject-introspection 2019-11-23 03:53:38 +00:00
Mario Rodas 669a6d0edb luaPackages.luasystem: fix build on darwin 2019-11-15 05:08:45 +09:00
Matthieu Coudron 5f3db033df
Merge pull request #71802 from teto/luadoc
adds Luadoc.
2019-10-24 18:04:12 +09:00
Matthieu Coudron 15818981fe luaPackages.luadoc: init at 3.0.1-1
Used in vim plugins like nvim-terminal-lua to generate html docs.
2019-10-23 20:03:57 +09:00
Matthieu Coudron af6bdae831 luaPackages.lualogging: init at 1.3.0-1
Dependency of luadoc
2019-10-23 20:00:45 +09:00
Matthieu Coudron 73c64f0f38 luaPackages.luacov: init at 0.13.0-1
It is needed to run luarocks test.
2019-10-14 21:53:23 +09:00
Daiderd Jordan fc408c8690
lua.pkgs.luv.libluv: fix linking against lua on darwin
[ 50%] Building C object CMakeFiles/luv.dir/src/luv.c.o
    [100%] Linking C shared library libluv.dylib
    Undefined symbols for architecture x86_64:
      "_luaL_addlstring", referenced from:
          _thread_dump in luv.c.o
      ...
2019-10-02 00:08:13 +02:00
Vladimír Čunát 217cf982c7
Merge branch 'master' into staging-next 2019-09-27 22:13:02 +02:00
Joachim F ad773d31e2
Merge pull request #69345 from joachifm/feat/split-version
Replace uses of splitString for splitting version strings
2019-09-27 06:19:18 +00:00
Joachim Fasting bad07dfac5
tree-wide: replace uses of splitString "." with lib.versions
Quoting from the splitString docstring:

   NOTE: this function is not performant and should never be used.

This replaces trivial uses of splitString for splitting version
strings with the (potentially builtin) splitVersion.
2019-09-26 17:42:49 +02:00
Vladimír Čunát eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Vladimír Čunát 22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Craig Hall 93e25e8b00
luaPackages.luv: add libluv output
Co-authored-by: Roman Volosatovs <rvolosatovs@riseup.net>
2019-09-16 22:00:26 +02:00
Izorkin 329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
Philipp 2787d4160c lua*Packages.lua-yajl: init at 2.0-1
Dependency for mudlet >= 4.0
2019-09-07 23:05:55 +09:00
Philipp fc250d64e5 lua*Packages.luautf8: init at 0.1.1-1
Dependency for mudlet >= 4.0
2019-09-07 23:05:55 +09: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
Luka Blaskovic 4d11f5dabd ljsyscall: init at 20180515 2019-08-28 19:58:14 +09:00
Alexei Robyn 740a7255b6 lua*Packages.moonscript: init at 0.5.0-1 (generated) 2019-08-21 22:06:32 +10:00
Alexei Robyn c84a282c74 lua*Packages.alt-getopt: init at 0.8.0-1 (generated) 2019-08-21 22:04:19 +10:00
Vladimír Čunát 47ad7d3131
lua*Packages.cqueues: fixup darwin build 2019-08-05 22:51:51 +02:00
Vladimír Čunát 81b91fe258
lua*Packages.luaossl: 20190612-0 -> 20190731-0
My main aim is to fix it on aarch64 NixOS.
2019-08-05 20:31:39 +02:00
Vladimír Čunát 265692f9ff
lua*Packages.cqueues: 20171014.52-0 -> 20190731.52-0
My main aim is to fix it on aarch64 NixOS.
The patch was included in the release.
2019-08-05 20:31:36 +02:00
Roman Volosatovs 9c52f30d2c luaPackages.luv: 1.29.1-2 -> 1.30.0-0 2019-07-29 14:02:23 +09:00
Ryan Mulligan 508ae42a0f treewide: fix redirect URLs 2019-07-10 12:52:51 -07:00
Vladimír Čunát 6df405b654
Merge #63569: luaPackages.bit32: fix with LuaJIT 2019-06-28 12:17:53 +02:00
Alexei Robyn 3ca771cdc3 luaPackages.luaexpat: Downgrade to fix issue and match typical distros
Matches version used on most distros. Fixes an issue with prosody.
Detailed reasoning behind this can be found
[here](https://github.com/NixOS/nixpkgs/pull/63108#issuecomment-504015507).
2019-06-24 04:08:29 +02:00
Alexei Robyn 4cdbc771fd luaPackages.bit32: Tiny patch to fix a LuaJIT-incompatible declaration 2019-06-20 23:20:02 +10:00
Alexei Robyn 460217d022 luaPackages.luadbi-mysql: Fix linking issue 2019-06-20 11:13:46 +10: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
Alexei Robyn 2792dc8a0a 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)
2019-06-13 20:12:00 +10: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
Matthieu Coudron 1b2e667ad6 luaPackages.lua-lsp: init at scm-2 2019-06-05 00:12:15 +09:00
Matthieu Coudron 021e04d0eb luaPackages.lpeglabel: init at 1.5.0 2019-06-05 00:11:56 +09:00
Matthieu Coudron 2fc71c7404 luaPackages.digestif: init at scm-1 2019-06-05 00:01:42 +09:00
Matthieu Coudron 95d036e042 lua: update generated packages.nix
basically update nvim-client and luassert
2019-06-04 19:13:26 +09:00
Will Dietz b01e5a4b62
luaPackages.luv: force using system libuv 2019-05-16 11:16:21 -05:00
Will Dietz 9c10ac1663
lua-modules/generated: regen for formatting, luv -> 1.28 2019-05-15 17:04:42 -05:00
Vladimír Čunát ec5f5a21d7
Merge #60614: lua*Packages improvements 2019-05-12 10:01:48 +02:00
Will Dietz d7ff576529
Merge pull request #60343 from dtzWill/fix/luarocks-nix-formatting-and-awesome-doc-goodness
luarocks-nix,luaPackages: formatting and additions; awesome: docs!
2019-05-10 16:56:58 -05: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 6108e63a01
lua*Packages.binaryheap: init at 0.4-1 (generated)
The generator wanted to do various changes in other packages as well,
but I didn't commit those.
2019-05-01 10:33:26 +02:00
Vladimír Čunát bf3dea4164
lua*Packages.luuid: don't clear generated meta 2019-05-01 10:32:09 +02:00
Luka Blaskovic ca80cf922a lua: add rapidjson, lua-toml and lua-messagepack to generated packages 2019-04-30 08:35:29 +00:00
Will Dietz 291d06d2ef generated-packages: manual touchup
* no leading whitespace
* collapse consecutive blank lines to single line
* indent fromJSON bits
2019-04-28 10:14:05 -05:00
Will Dietz 55f7515442 luarocks: Add 'markdown' 2019-04-28 10:14:05 -05:00
Will Dietz c1f3c92fef lua-modules/generated-packages: regen
Mostly formatting improvements,
basexx apparently has new version which was picked up.
2019-04-28 10:14:05 -05:00
Will Dietz 9a3ed7ea04 luaPackages: add ldoc 2019-04-28 10:14:05 -05: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
Daniel Schaefer bac4d95aa2 treewide: Change URLs to HTTPS
Lots of URLs were HTTP redirect to HTTPS. Changed those and checked them
if there's actual content. Inspired by
https://github.com/NixOS/nixpkgs/issues/60004
2019-04-22 10:19:54 +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
Matthieu Coudron 246e354e1f
lua5Packages.luuid: fix build
libuuid is null outside of linux which may explain why ofborg refused it.
2019-03-07 10:34:26 +00: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
Will Dietz 2a1c7b1f32 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!)
2019-02-25 16:18:02 -06: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
Luka Blaskovic 00349e27e5 lua packages: add init.lua to modules search path 2018-05-24 13:43:15 +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
xd1le df5691d677 buildLuaPackage: set makeFlags directly instead of through preBuild
So that lua packages can override it without having to resort to setting
makeFlagsArray in preBuild.
2017-10-10 02:51:05 +11:00
wyvie 83fc5069f4 lua: Fixed luasql.patch
Closes #4344
2014-10-01 06:00:06 +01:00
wyvie d4b7910f80 Added more lua modules to lua-packages, added them as dependencies for
mudlet

Closes #4269
2014-09-30 07:42:19 +01:00
wyvie 111b5aa38c Assertion throws err message on fail in buildLuaPackage 2014-09-23 13:56:45 +02:00