Commit Graph

77 Commits

Author SHA1 Message Date
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