| Commit message (Collapse) | Author | Age |
|
|
|
|
|
|
| |
We also remove the CVE-2019-6706 patch because it has been merged
upstream. See:
https://www.lua.org/work/diffs-lua-5.3.5-lua-5.3.6.html
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
It can be source of trouble for some read-only folders (libluv for
instance) and slow down install.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The 672c3c1d2a8ed40c1ef6bd29823af6a8c915584c refactor accidentally
dropped the last version component from the source URLs. This change
puts its back.
$ for lua in lua5_{1,2,3};do nix-instantiate --json --eval . -A $lua.src.urls | jq -r '.[]' | xargs nix-prefetch-url; done
Before this change:
lua-5.1.tar.gz 1hbjhh211p82vhwqhx4mmhmvhv56060acnka80gbmfdk3q3bjnvz (wrong hash because this is lua 5.1.0. We want 5.1.5 )
lua-5.2.tar.gz HTTP error 404
lua-5.3.tar.gz HTTP error 404
After this change:
lua-5.1.5.tar.gz 0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16
lua-5.2.4.tar.gz 0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr <-- Desired hash
lua-5.3.5.tar.gz 1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc
Converted to base16 with `nix-hash --type sha256 --to-base16`:
lua-5.1.5.tar.gz 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 <-- Desired hash
lua-5.2.4.tar.gz b9e2e4aad6789b3b63a056d442f7b39f0ecfca3ae0f1fc0ae4e9614401b69f4b
lua-5.3.5.tar.gz 0c2eed3f960446e1a3e4b9a1ca2f3ff893b6ce41942cf54d5dd59ab4b3b058ac <-- Desired hash
|
|\ |
|
| |\
| | |
| | | |
lua wrapper: Fix bash error
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Recently, we made it harder for external code to use some stdenv-only bash
variables by unsetting them in [1] But Lua's `withPackages` was sourcing some
setup hooks in [2], which required those bash variables.
I say great! We caught something bad: Lua should use normal dependencies, even
though that is harder with `buildEnv`. Now it works that way, and everything is
fine.
[1]: https://github.com/NixOS/nixpkgs/blob/9d3911f806034197bb7ace586cc3696ffce7f447/pkgs/stdenv/generic/setup.sh#L574-L578
[2]: https://github.com/NixOS/nixpkgs/blob/9d3911f806034197bb7ace586cc3696ffce7f447/pkgs/development/interpreters/lua-5/wrapper.nix#L23-L27
CC @matthewbauer
|
| |/
| |
| |
| |
| |
| |
| |
| | |
Taken from
http://launchpadlibrarian.net/417853567/lua5.3_5.3.3-1_5.3.3-1ubuntu0.18.10.1.diff.gz
and adapted to our needs.
Re #54799
|
| |\ |
|
| | | |
|
| |/ |
|
|/
|
|
|
| |
That is because this commit should be merged to both master and
release-19.09.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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
|
|\ |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Nix repl hangs when evaluating empty files.
find -name "*.nix" -empty -delete
|
|/ / |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
The makefile isn't able to find the toolchain when cross-compiling. I
helped it a little bit by adding the parameters explicitly.
|
|/
|
|
|
|
|
|
|
| |
treewide replacement of
stdenv.mkDerivation rec {
name = "*-${version}";
version = "*";
to pname
|
|
|
|
|
|
|
| |
`"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.
|
|\
| |
| | |
Lua/luarocks packaging 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`
|
|/
|
|
|
|
| |
* treewide: remove unused variables
* making ofborg happy
|
|
|
|
|
| |
I couldn't find any reference to it and luazip was already packaged in
lua-packages.nix (now generated).
|
| |
|
|
|
|
|
|
| |
lua: merge lua5.X interpreters
similar to what was done for python.
Makes it easier to change the passthru settings and the lua infrastructure.
|
|
|
|
| |
Allows to work around https://github.com/luarocks/luarocks/issues/988 on darwin
|
|
|
|
| |
the new luarocks 3.0.4 uses different paths for the manifests, hence creating new collisions.
|
|
|
|
| |
it was previously run only for src.rock
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* 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
|
| |
|
|
|
|
|
|
|
| |
* lua: add withPackages function
First step towards more automation similar to the haskell backend.
Follow up of https://github.com/NixOS/nixpkgs/pull/33903
|
|
|
| |
Lua 5.2.4 is the EOL point release of the 5.2 series.
|
|
|
|
|
|
|
|
|
|
| |
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
|
|\ |
|
| |
| |
| |
| |
| |
| |
| | |
Update to the most recent version of the 5.3 series that was released
yesterday.
Signed-off-by: Philipp Gesang <phg@phi-gamma.net>
|
|/ |
|
|\
| |
| | |
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>
|
|/
|
|
|
|
|
|
|
| |
* 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
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
|
|
|
| |
mostly just forward environment variables to make arguments,
this partially reverts 5d1e51a199917fa945cb59567597e354c6e4f56d
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)
|
| |
|
| |
|
| |
|
|\
| |
| | |
Improvements for Prosody
|