Commit Graph

207 Commits

Author SHA1 Message Date
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
Robin Gloster
d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00:00
Robin Gloster
f791c1074d lua.i686-linux: disable stackprotector hardening 2016-04-05 16:44:30 +00:00
Vladimír Čunát
dd915f82e7 expat: split dev output 2015-10-28 10:09:34 +01:00
Michael Raskin
e66294151a Adding Lua 5.3, seems to work 2015-06-02 20:32:12 +03:00
Joel Taylor
d60058af4b lua: update patch for 5.2 on darwin 2015-05-18 13:12:45 -07:00
Joel Taylor
c7ed090e21 Revert "fix lua.pc library name"
This reverts commit 330836a82b.
2015-05-17 15:03:53 -07:00
Joel Taylor
330836a82b fix lua.pc library name 2015-05-17 14:34:22 -07:00
Arseniy Seroka
75ee41fdb9 lua_patch: fix url 2015-05-06 22:05:44 +03:00
Arseniy Seroka
f24d8777dd Revert "lua_patch: fix sha"
This reverts commit c5a0dae668.
2015-05-06 22:05:20 +03:00
Arseniy Seroka
c5a0dae668 lua_patch: fix sha 2015-05-06 22:01:16 +03:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
wyvie
4d5336316c New package: lua-zip-1.2.3
Closes #4138
2014-09-20 23:32:17 +01:00
Joel Taylor
6f949b2e87 get rid of nasty CC stuff 2014-09-09 13:54:26 -07:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Vladimír Čunát
d09736b7c1 lua5 sockets: our version only works with lua 5.1 2014-09-09 21:49:35 +02:00
Vladimír Čunát
15cb79e48e lua-5.1: fix CVE-2014-5461 by upstream+Debian patch 2014-09-09 21:46:44 +02:00
Eelco Dolstra
af69fcde47 Fix Nixpkgs evaluation
error: attribute `luaversion' missing, at /home/eelco/Dev/nixpkgs/pkgs/development/interpreters/lua-5/expat.nix:16:34
2014-09-08 13:10:13 +02:00
Vladimír Čunát
420385f81a lua-5.2: minor update to fix CVE-2014-5461
Note that almost all packages use lua-5.1 which does remain vulnerable,
as they released no update on that branch. CC: @peti.
2014-09-06 21:26:03 +02:00
Peter Simons
8e7442b3ed lua-5: don't restrict the platforms which can build this package
Hydra builds run only on Linux, but all other platforms can build LUA,
too, if necessary.
2014-08-09 15:04:44 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Bjørn Forsman
559eaeb2d2 Revert "use wrapper to set LUA_PATH variable"
This reverts commit 807cd4b4d4, as it
broke the 'awesome' package. It was also an incomplete change, only
modifying lua-5.1 and none of the other lua versions.

A better approach, if wanting lua to pick up external modules, would be
to loop over $NIX_PROFILES. $NIX_PROFILES is unset in build
environments, so it should be safe.

Conflicts:
	pkgs/development/interpreters/lua-5/5.1.nix
2014-07-29 18:42:20 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Philipp Gesang
df3c10caa3
lua-5.1, lua-5.2: fix typo / copy-n-paste mistake in configurePhase
s/LDLAGS/LDFLAGS/g in both packages
2014-07-11 07:17:11 +02:00
Markus Kohlhase
1d109fc211 added lua-sec-0.5 2014-07-08 00:26:04 +02:00
Austin Seipp
d958fc4ea2 Merge pull request #3137 from flosse/lua5-prefix-fix
use wrapper to set LUA_PATH variable to fix #3036
2014-07-02 13:47:21 -05:00
Markus Kohlhase
0d30718357 include share directory 2014-07-01 19:16:24 +02:00
Markus Kohlhase
e0fc4e7734 added lua-filesystem-1.6.2 2014-07-01 13:34:08 +02:00
Markus Kohlhase
807cd4b4d4 use wrapper to set LUA_PATH variable 2014-06-30 03:43:20 +02:00
Markus Kohlhase
7987cd2cc1 added luaexpat 1.3.0 2014-06-30 00:38:05 +02:00
aszlig
625d7b9043
Merge pull request #1928 from 'cross-win-osx'.
This includes a lot of fixes for cross-building to Windows and Mac OS X
and could possibly fix things even for non-cross-builds, like for
example OpenSSL on Windows.

The main reason for merging this in 14.04 already is that we already
have runInWindowsVM in master and it doesn't work until we actually
cross-build Cygwin's setup binary as the upstream version is a fast
moving target which gets _overwritten_ on every new release.

Conflicts:
	pkgs/top-level/all-packages.nix
2014-04-21 10:00:35 +02:00
John Wiegley
b18dc38dc1 Patch lua52 to build on Darwin 2014-04-15 04:46:14 -05:00
John Wiegley
f9c2f684e8 Allow lua5 to build as a dylib on Darwin 2014-04-14 14:39:23 -05:00
aszlig
c7bac81c66
Merge 'mingw-w64' and 'darwin' into cross-win-osx.
Both branches have quite a lot in common, so it's time for a merge and
do the cleanups with respect to both implementations and also generalize
both implementations as much as possible.

This also closes #1876.

Conflicts:
	pkgs/development/interpreters/lua-5/5.2.nix
	pkgs/development/libraries/SDL/default.nix
	pkgs/development/libraries/glew/default.nix
	pkgs/top-level/all-packages.nix
2014-03-12 10:16:51 +01:00
aszlig
745c477930
lua5.2/cross: Fix build for Darwin.
The ld from cctools doesn't like the -soname argument, so let's strip it
off for now until we have a binutils <-> cctools bridge.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-12 10:00:46 +01:00
aszlig
e64b342fa8
Use mingw-w64 for 32bit Windows builds as well.
Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 22:38:48 +01:00
aszlig
4f69722ee5
lua52/cross: Allow to cross-compile to mingw-w64.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-02-24 07:26:25 +01:00
Petr Rockai
5383e07e40 lua5: Add the lua-sockets extension. 2014-01-28 21:48:47 +01:00
Michael Raskin
826e7f8a94 Add a LUA_COMPAT_ALL version of Lua 5.2 2014-01-12 22:15:54 +04:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Peter Simons
9c6e0e584c lua-5.1: fix $prefix in installed pkgconfig file 2013-10-03 17:09:02 +02:00
Peter Simons
8e3df6a494 lua: fix issue #1009 2013-09-25 12:29:56 +02:00
Peter Simons
b13188dff0 lua-5.2: install missing liblua.so.5.2.2 binary 2013-09-17 11:45:55 +02:00
Peter Simons
ad8a921f15 lua-5.1: install missing liblua.so.5.1.5 binary 2013-09-17 11:33:57 +02:00
Peter Simons
9c45b91002 lua-5: update default version from 5.1.4 to 5.1.5 and add version 5.2.2 2013-09-16 11:50:20 +02:00
Peter Simons
5bf938a635 lua-5.1: build liblua.so and install the pkgconfig file and the documentation 2012-12-25 11:25:56 +01:00
Peter Simons
a352796e0d lua: add version 5.1
The 5.1 build system doesn't seem to support building a shared object anymore?
2012-10-10 19:24:37 +02:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Lluís Batlle i Rossell
e43bd7c4ce Made lua and task warrior unstable crossbuild fine
svn path=/nixpkgs/trunk/; revision=31251
2012-01-03 19:12:06 +00:00
Peter Simons
c9695f2d48 Added obsolete lua-5.0.3 version, which is required by gravit.
svn path=/nixpkgs/trunk/; revision=27692
2011-07-10 14:04:19 +00:00
Lluís Batlle i Rossell
e6a787f44a Making lua and boost cross-build.
svn path=/nixpkgs/trunk/; revision=23807
2010-09-15 09:56:06 +00:00
Rob Vermaas
d9f435106c lua5: re-enable -fPIC for lua5
svn path=/nixpkgs/trunk/; revision=23668
2010-09-07 12:56:49 +00:00
Peter Simons
08244152cc pkgs/development/interpreters/lua-5: overriding CFLAGS on the make command-line breaks the build
svn path=/nixpkgs/trunk/; revision=23367
2010-08-23 15:20:49 +00:00
Peter Simons
8170f3b73b pkgs/development/interpreters/lua-5: FreeBSD can't handle "install -D"; use "ensureDir" instead
svn path=/nixpkgs/trunk/; revision=23366
2010-08-23 15:09:02 +00:00
Peter Simons
c50ae128d5 pkgs/development/interpreters/lua-5: added support for all Unix platforms
svn path=/nixpkgs/trunk/; revision=23362
2010-08-23 14:41:03 +00:00
Peter Simons
f79f257c88 pkgs/development/interpreters/lua-5: $makeFlags is not a list
svn path=/nixpkgs/trunk/; revision=23359
2010-08-23 14:29:26 +00:00
Peter Simons
a65aab0171 pkgs/development/interpreters/lua-5: cosmetic changes
svn path=/nixpkgs/trunk/; revision=23358
2010-08-23 14:27:33 +00:00
Peter Simons
d3a8a3f7d0 pkgs/development/interpreters/lua-5: added meta section to the expression
svn path=/nixpkgs/trunk/; revision=23357
2010-08-23 14:26:26 +00:00
David Guibert
9f77579f41 lua: install lua.pc
svn path=/nixpkgs/trunk/; revision=23049
2010-08-09 06:48:21 +00:00
Lluís Batlle i Rossell
9885a6a4da I did not enable well the -fPIC for lua in my last commit. 2nd attempt, for vlc to build fine.
Making vlc build finally (disabling dbus in it)

svn path=/nixpkgs/trunk/; revision=22415
2010-06-25 18:34:35 +00:00
Lluís Batlle i Rossell
029299e710 Making lua build with -fPIC. This allows building vlc on linux-x86_64.
svn path=/nixpkgs/trunk/; revision=22411
2010-06-24 23:05:15 +00:00
Lluís Batlle i Rossell
a6e86e241f Updating lua5.
svn path=/nixpkgs/trunk/; revision=15223
2009-04-21 19:47:20 +00:00
Yury G. Kudryashov
10a1a685a0 lua-5: url correted
svn path=/nixpkgs/trunk/; revision=10331
2008-01-28 19:38:59 +00:00
Yury G. Kudryashov
2d0d0e8fbf * zsh upgraded to 4.3.2, lua upgraded to 5.1.2 (works only on linux now)
svn path=/nixpkgs/trunk/; revision=8990
2007-07-17 16:43:06 +00:00
Eelco Dolstra
f861c8b66c * makeFlags -> buildFlags in a few places.
svn path=/nixpkgs/trunk/; revision=7503
2006-12-27 18:34:35 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Christof Douma
1fa4c66b73 added version to uuagc
added: noweb, lua-5.x, lua-4.x, mk, qc-- (as qcmm)

svn path=/nixpkgs/trunk/; revision=4681
2006-02-02 17:07:07 +00:00