From 906f1b48e20a032c22a164c89f9e8862ab2bec7a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 3 Jan 2018 09:01:53 +0100 Subject: gnu: luajit: Update to 2.1.0-beta3. * gnu/packages/lua.scm (luajit): Update to 2.1.0-beta3. [source]: Remove symlinks patch. * gnu/packages/patches/luajit-symlinks.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/packages/lua.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index b375ff90c3..fd14956007 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 doncatnip ;;; Copyright © 2016, 2017 Clément Lassieur ;;; Copyright © 2016 José Miguel Sánchez García +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Fis Trivial ;;; ;;; This file is part of GNU Guix. @@ -116,15 +117,14 @@ for configuration, scripting, and rapid prototyping.") (define-public luajit (package (name "luajit") - (version "2.1.0-beta2") + (version "2.1.0-beta3") (source (origin (method url-fetch) (uri (string-append "http://luajit.org/download/LuaJIT-" version ".tar.gz")) (sha256 - (base32 "0iyghj1xjlmd9ywa4flf9yszynf3jhbp0yqb9b49k7ab0g528fbi")) - (patches (search-patches "luajit-symlinks.patch" - "luajit-no_ldconfig.patch")))) + (base32 "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs")) + (patches (search-patches "luajit-no_ldconfig.patch")))) (build-system gnu-build-system) (arguments '(#:tests? #f ;luajit is distributed without tests -- cgit v1.2.3 From a093bb69679f7128a0f930ea825a4babe88ca100 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 8 Feb 2018 01:38:03 +0100 Subject: gnu: luajit: Make available as ‘luajit’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/lua.scm (luajit)[arguments]: Add a ‘create-luajit-symlink’ phase to make the interpreter available simply as ‘luajit’. --- gnu/packages/lua.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index fd14956007..5592b96937 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -127,9 +127,19 @@ for configuration, scripting, and rapid prototyping.") (patches (search-patches "luajit-no_ldconfig.patch")))) (build-system gnu-build-system) (arguments - '(#:tests? #f ;luajit is distributed without tests - #:phases (modify-phases %standard-phases (delete 'configure)) - #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) + `(#:tests? #f ; luajit is distributed without tests + #:phases + (modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-after 'install 'create-luajit-symlink + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (with-directory-excursion bin + (symlink ,(string-append name "-" version) + ,name) + #t))))) + #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) (home-page "http://www.luajit.org/") (synopsis "Just in time compiler for Lua programming language version 5.1") (description -- cgit v1.2.3 From 0386cdd373432f9492266c9b7b95049bcc5a8181 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 8 Feb 2018 01:42:24 +0100 Subject: gnu: luajit, lua5.x-bitop: Use HTTPS home pages. * gnu/packages/lua.scm (luajit, make-lua-bitop)[home-page]: Use HTTPS. --- gnu/packages/lua.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 5592b96937..6a1e62418c 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -140,7 +140,7 @@ for configuration, scripting, and rapid prototyping.") ,name) #t))))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))))) - (home-page "http://www.luajit.org/") + (home-page "https://www.luajit.org/") (synopsis "Just in time compiler for Lua programming language version 5.1") (description "LuaJIT is a Just-In-Time Compiler (JIT) for the Lua @@ -436,7 +436,7 @@ Grammars (PEGs).") (modify-phases %standard-phases (delete 'configure)))) (inputs `(("lua", lua))) - (home-page "http://bitop.luajit.org/index.html") + (home-page "https://bitop.luajit.org/index.html") (synopsis "Bitwise operations on numbers for Lua") (description "Lua BitOp is a C extension module for Lua which adds bitwise operations -- cgit v1.2.3