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
..
5.1.0004-Fix-stack-overflow-in-vararg-functions.patch	lua5.1: fix broken source fetch (#40748)	2018-05-19 17:30:04 +02:00
5.1.darwin.patch
5.2.darwin.patch	lua-{5.2,5.3}: fixup dylib symlink names on Darwin	2017-03-10 00:54:32 +01:00
build-lua-package.nix	luajitPackages: Improve derivation names	2019-06-24 04:04:37 +02:00
build-rocks.nix	lua: add withPackages function (#54460)	2019-01-30 14:13:15 +00:00
build-rockspec.nix	lua: add withPackages function (#54460)	2019-01-30 14:13:15 +00:00
default.nix	treewide: remove unused variables (#63177)	2019-06-16 19:59:05 +00:00
filesystem.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
interpreter.nix	lua: fix cross-compilation; fixes #66742	2019-08-19 12:04:26 +03:00
lua-5.3-dso.make
setup-hook.nix	lua: add withPackages function (#54460)	2019-01-30 14:13:15 +00:00
setup-hook.sh	Lua generate nix packages from luarocks (#54978)	2019-02-04 11:30:58 +00:00
sockets.nix	treewide: name -> pname (easy cases) (#66585)	2019-08-15 13:41:18 +01:00
with-packages.nix	lua: add withPackages function (#54460)	2019-01-30 14:13:15 +00:00
wrap-lua.nix	Lua generate nix packages from luarocks (#54978)	2019-02-04 11:30:58 +00:00
wrap.sh	Lua generate nix packages from luarocks (#54978)	2019-02-04 11:30:58 +00:00
wrapper.nix	treewide: remove unused variables (#63177)	2019-06-16 19:59:05 +00:00
zip.patch