diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-31 23:47:34 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-31 23:47:34 +0100 |
| commit | 447802a68377262bedcb8ed5da263c11386ef855 (patch) | |
| tree | f3a15fe492f9517e513037c5f63cb00e6bb21e38 /pkgs/top-level/lua-packages.nix | |
| parent | fe83d911577dce6a3ed35a30332cb699dd9438d8 (diff) | |
| parent | 681c6f99a85bc1fc9cc5ecd4c7cfa361ef75e8de (diff) | |
| download | nixlib-447802a68377262bedcb8ed5da263c11386ef855.tar nixlib-447802a68377262bedcb8ed5da263c11386ef855.tar.gz nixlib-447802a68377262bedcb8ed5da263c11386ef855.tar.bz2 nixlib-447802a68377262bedcb8ed5da263c11386ef855.tar.lz nixlib-447802a68377262bedcb8ed5da263c11386ef855.tar.xz nixlib-447802a68377262bedcb8ed5da263c11386ef855.tar.zst nixlib-447802a68377262bedcb8ed5da263c11386ef855.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/top-level/lua-packages.nix')
| -rw-r--r-- | pkgs/top-level/lua-packages.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c94a401db0fb..f233ae43ad10 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -438,12 +438,15 @@ let }; - luastdlib = buildLuaPackage { - name = "stdlib"; + luastdlib = buildLuaPackage rec { + name = "stdlib-${version}"; + version = "41.2.1"; - src = fetchzip { - url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip"; - sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms"; + src = fetchFromGitHub { + owner = "lua-stdlib"; + repo = "lua-stdlib"; + rev = "release-v${version}"; + sha256 = "03wd1qvkrj50fjszb2apzdkc8d5bpfbbi9pajl0vbrlzzmmi3jlq"; }; nativeBuildInputs = [ autoreconfHook unzip ]; @@ -616,7 +619,7 @@ let # NOTE: For updating, new Lua mpack bindings live at: # https://github.com/libmpack/libmpack-lua. src = libmpack.src; - sourceRoot = "libmpack-${libmpack.rev}-src/binding/lua"; + sourceRoot = "${src.name}/binding/lua"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libmpack ]; # ++ [ libtool lua ]; |