ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 13:28:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: lua: Update to 5.3.3.

Browse source 
* gnu/packages/patches/lua52-liblua-so.patch: Rename to ...
* gnu/packages/patches/lua-liblua-so.patch: ... this. Add version comment.
* gnu/local.mk (dist_patch_DATA): Adjust patch name.
* gnu/packages/lua.scm (lua): Update to 5.3.3.
[source]: Use https URL. Use new patch name.
[home-page]: Use https URL.
(lua-5.2): New variable.
(lua-5.1)[source]: Use https URL.
This commit is contained in:
Marius Bakke 2016-10-31 13:02:59 +00:00
parent de975de39b
commit 6dbf1fec0d
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
3 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/local.mk
View file

@ -698,7 +698,7 @@ dist_patch_DATA = \
%D%/packages/patches/lua-pkgconfig.patch \ %D%/packages/patches/lua-pkgconfig.patch \
%D%/packages/patches/lua51-liblua-so.patch \ %D%/packages/patches/lua51-liblua-so.patch \
%D%/packages/patches/lua51-pkgconfig.patch \ %D%/packages/patches/lua51-pkgconfig.patch \
%D%/packages/patches/lua52-liblua-so.patch \ %D%/packages/patches/lua-liblua-so.patch \
%D%/packages/patches/luajit-no_ldconfig.patch \ %D%/packages/patches/luajit-no_ldconfig.patch \
%D%/packages/patches/luajit-symlinks.patch \ %D%/packages/patches/luajit-symlinks.patch \
%D%/packages/patches/luit-posix.patch \ %D%/packages/patches/luit-posix.patch \

25
gnu/packages/lua.scm
View file

@ -40,15 +40,15 @@ (define-module (gnu packages lua)
(define-public lua (define-public lua
(package (package
(name "lua") (name "lua")
(version "5.2.4") (version "5.3.3")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.lua.org/ftp/lua-" (uri (string-append "https://www.lua.org/ftp/lua-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr")) (base32 "18mcfbbmjyp8f2l9yy7n6dzk066nq6man0kpwly4bppphilc04si"))
(patches (search-patches "lua-pkgconfig.patch" (patches (search-patches "lua-pkgconfig.patch"
"lua52-liblua-so.patch")))) "lua-liblua-so.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("readline" ,readline))) (inputs `(("readline" ,readline)))
(arguments (arguments
@ -69,7 +69,7 @@ (define-public lua
(string-append "INSTALL_TOP=" out) (string-append "INSTALL_TOP=" out)
(string-append "INSTALL_MAN=" out (string-append "INSTALL_MAN=" out
"/share/man/man1"))))))))) "/share/man/man1")))))))))
(home-page "http://www.lua.org/") (home-page "https://www.lua.org/")
(synopsis "Embeddable scripting language") (synopsis "Embeddable scripting language")
(description (description
"Lua is a powerful, fast, lightweight, embeddable scripting language. Lua "Lua is a powerful, fast, lightweight, embeddable scripting language. Lua
@ -80,12 +80,25 @@ (define-public lua
for configuration, scripting, and rapid prototyping.") for configuration, scripting, and rapid prototyping.")
(license license:x11))) (license license:x11)))
(define-public lua-5.2
(package (inherit lua)
(version "5.2.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://www.lua.org/ftp/lua-"
version ".tar.gz"))
(sha256
(base32 "0jwznq0l8qg9wh5grwg07b5cy3lzngvl5m2nl1ikp6vqssmf9qmr"))
(patches (search-patches "lua-pkgconfig.patch"
"lua-liblua-so.patch"))))))
(define-public lua-5.1 (define-public lua-5.1
(package (inherit lua) (package (inherit lua)
(version "5.1.5") (version "5.1.5")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://www.lua.org/ftp/lua-" (uri (string-append "https://www.lua.org/ftp/lua-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16")) (base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16"))

2
gnu/packages/patches/lua52-liblua-so.patch → gnu/packages/patches/lua-liblua-so.patch
View file

@ -1,3 +1,5 @@
This applies to Lua 5.2 and 5.3.
From 7a1b4e0829124976878ca2765a8e546667a92ceb Mon Sep 17 00:00:00 2001 From 7a1b4e0829124976878ca2765a8e546667a92ceb Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name> From: Leo Famulari <leo@famulari.name>
Date: Fri, 30 Oct 2015 19:11:31 -0400 Date: Fri, 30 Oct 2015 19:11:31 -0400