Commit graph

116 commits

Author SHA1 Message Date
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
Frederik Rietdijk ad1d58c622 Merge staging-next into staging 2019-08-31 10:04:20 +02:00
Frederik Rietdijk fc74ba8291 Merge master into staging-next 2019-08-31 09:50:38 +02:00
zimbatm 80a3988150
remove empty nix file
Nix repl hangs when evaluating empty files.

    find -name "*.nix" -empty -delete
2019-08-31 00:00:29 +02:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Vladimír Čunát 2e6bf42a22
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version.  Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job.  There might be some fallback to these
conflicts, but I believe it should be minimal.

Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Vika 68847aeef4 lua: fix cross-compilation; fixes #66742
The makefile isn't able to find the toolchain when cross-compiling. I
helped it a little bit by adding the parameters explicitly.
2019-08-19 12:04:26 +03: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
Alexei Robyn f2aa671ad7 luajitPackages: Improve derivation names
`"lua" + lua.luaversion + "-"` resolves to "lua51-" for both Lua
5.1 and LuaJIT packages. With this, LuaJIT packages instead get
`lua.name + "-"`, which currently resolves to "luajit-2.1.0-beta3-".
This makes it easy to distinguish the two in store paths etc.
2019-06-24 04:04:37 +02: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 8eabbb3d20 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`
2019-06-13 20:53:53 +10:00
Matthieu Coudron f67d8591a1 lua: removed zip.nix orphan file
I couldn't find any reference to it and luazip was already packaged in
lua-packages.nix (now generated).
2019-06-05 16:21:18 +09:00
Will Dietz 4e09baaaa2 fix lua53Packages.lua 2019-04-27 13:39:43 -05:00
Matthieu Coudron 672c3c1d2a
lua: merge lua5.X interpreters (#59919)
lua: merge lua5.X interpreters

similar to what was done for python.
Makes it easier to change the passthru settings and the lua infrastructure.
2019-04-27 22:00:12 +09:00
Matthieu Coudron 612c816596 buildLuarocksPackage: forcefully create $out
Allows to work around https://github.com/luarocks/luarocks/issues/988 on darwin
2019-04-14 16:41:11 +09:00
Matthieu Coudron 16e3574e29 buildLuarocksPackage: adjust the manifest path
the new luarocks 3.0.4 uses different paths for the manifests, hence creating new collisions.
2019-03-08 13:24:23 +09: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 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
Will Dietz d96dcb66fb lua-5 setup-hook: quiet noisy 'cd -' printing path repeatedly 2019-01-30 13:55:07 -06: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
Christian Kauhaus 6adb944cb6 lua: 5.2.3 -> 5.2.4 (#47126)
Lua 5.2.4 is the EOL point release of the 5.2 series.
2018-09-22 19:09:33 +02:00
Christian Kauhaus 544eaaa52b lua: remove lua4 and lua5_0
Both versions are not maintained anymore upstream and have open security
issues, e.g. https://nvd.nist.gov/vuln/detail/CVE-2014-5461.

The same holds for lua5_1 but that seems to be in use in some places.

Re #47122
Re #47123
2018-09-21 15:56:41 +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
Philipp Gesang 2c21a970e9
lua5_3: update interpreter version 5.3.4 -> 5.3.5
Update to the most recent version of the 5.3 series that was released
yesterday.

Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
2018-07-11 07:30:52 +02:00
Matthew Bauer e67fb11d4c
Merge pull request #42473 from roosemberth/lua53-pkgconfig
lua5.3/pkgconfig: add lua5.3.pc
2018-07-05 22:17:50 -04:00
Silvan Mosberger 57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Roosembert Palacios 1f44c02181
lua5.3/pkgconfig: add lua5.3.pc
Some applications try to build using `pkgconfig lua5.3 --libs...` as some major
distributions use this name. Add a symlink to the lua.pc pkgconfig file.

Signed-off-by: Roosembert Palacios <roosembert.palacios@epfl.ch>
2018-06-24 04:25:48 +02:00
Benjamin Hipple 17f50018c0 lua5.1: fix broken source fetch (#40748)
The upstream src URL for the patch appears to no longer exist. Per discussion in
https://github.com/NixOS/nixpkgs/issues/39927, the upstream URL is not stable,
so this commit inlines the patch in the nixpkgs src tree.
2018-05-19 17:30:04 +02:00
Will Dietz ebe7b86bac lua-{5.2,5.3}: cross fixups, drop crossAttrs
mostly just forward environment variables to make arguments,
this partially reverts 5d1e51a199
which removed them because they're already set in env--
but that's not enough to override make vars.

Also, readline is buildInput not nativeBuildInput

(we need headers and to link against it)
2018-03-21 16:13:27 -05:00
Ben Gamari 47540dab74 lua: Fix cross-compilation 2018-02-13 09:44:27 -06:00
Yegor Timoshenko 506c89c30a maintainers: remove mornfall from packages 2018-01-17 05:17:33 +00:00
Will Dietz 681555c11c lua-5: isMingw -> isMinGW 2018-01-09 11:23:56 -05:00
Orivej Desh 40950f6a2d
Merge pull request #31006 from florianjacob/prosody
Improvements for Prosody
2017-12-09 09:19:24 +00:00
Orivej Desh 00ced68a9e lua5_1: provide version 2017-11-29 03:01:15 +00:00
Markus Kohlhase d7ee7cf9d9 lua-filesystem: remove flosse from the list of maintainers 2017-11-06 15:58:59 +01:00
Evan Wallace a3b1f77533 lua5_3: 5.3.0 -> 5.3.4
Updated to latest upstream version
2017-10-29 12:54:26 +00:00
Silvan Mosberger f5fa5fa4d6 pkgs: refactor needless quoting of homepage meta attribute (#27809)
* pkgs: refactor needless quoting of homepage meta attribute

A lot of packages are needlessly quoting the homepage meta attribute
(about 1400, 22%), this commit refactors all of those instances.

* pkgs: Fixing some links that were wrongfully unquoted in the previous
commit

* Fixed some instances
2017-08-01 22:03:30 +02:00
John Ericson 5d1e51a199 lua 5: Don't use stdenv.cross, and use less make flags
cc-wrapper will define environment variables matching those now
2017-06-28 18:21:06 -04:00
Vladimír Čunát 9ad1aaae53
lua5_{sec,1_sockets,expat}: convert to aliases
There's nothing better in these expressions than what we have in
lua-packages.nix
2017-05-02 14:00:44 +02:00
Vladimír Čunát d56e596da7
lua-{5.2,5.3}: fixup dylib symlink names on Darwin
Hopefully; I didn't test it.
https://github.com/NixOS/nixpkgs/pull/6311#issuecomment-285521028
2017-03-10 00:54:32 +01:00
Jörg Thalheim a6e2d5fcbb
lua5_{2,3}: replace sha1 with sha256 2017-02-28 18:02:51 +01:00
Franz Pletz 647b2ce168 lua5_0: disable stackprotector hardening on i686 2016-08-24 19:25:19 +02:00
Robin Gloster 1b979d8384 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-03 13:34:44 +00:00
Tuomas Tynkkynen 3875690d80 lua5: Re-enabel on Darwin
Prior to 1bf5ded193 this contained
`hydraPlatforms = platforms.linux`, which was apparently misleading.
2016-08-02 23:14:21 +03:00
Tuomas Tynkkynen 21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen 1bf5ded193 treewide: Lots of meta.hydraPlatforms -> meta.platforms
In all of these files, there is no meta.platforms but only
meta.hydraPlatforms, which doesn't seem to have any purpose except being
inconsistent.
2016-08-02 21:17:44 +03:00
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +02:00
Peter Simons 8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00