From 459d7cfbc4f4821b645e93149717d38b7a80135e Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Thu, 24 Jun 2021 13:23:21 +0000 Subject: gnu: fmt: Update to 8.0.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/pretty-print.scm (fmt): Update to 8.0.1, (fmt-7): New variable. * gnu/packages/astronomy.scm (celestia)[inputs], gnu/packages/kodi.scm (kodi)[inputs], gnu/packages/lua.scm (emilua)[inputs]: Change to fmt-7. Signed-off-by: Ludovic Courtès --- gnu/packages/lua.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 0ecc91294f..e40d28a473 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2020 Simon South ;;; Copyright © 2020 Paul A. Patience ;;; Copyright © 2021 Vinícius dos Santos Oliveira +;;; Copyright © 2021 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -1141,7 +1142,7 @@ shell command executions.") (inputs `(("boost" ,boost) ("boost-static" ,boost-static) - ("fmt" ,fmt) + ("fmt" ,fmt-7) ;; LuaJIT has a 2GiB addressing limit[1] that has been fixed on OpenResty ;; fork. Emilua is severely affected by this limit, so the upstream package ;; is avoided. Emilua also depends on the -DLUAJIT_ENABLE_LUA52COMPAT -- cgit v1.2.3 From 6ed2c5e2a414181af88793dc01d17e16914fb0dd Mon Sep 17 00:00:00 2001 From: jgart Date: Mon, 15 Nov 2021 00:56:32 -0500 Subject: gnu: fennel: Update to 1.0.0. * gnu/packages/lua.scm (fennel): Update to 1.0.0. [origin]: Remove unneeded snippet. [arguments]: Remove custom 'patch-lua-calls, 'install-manpage phases. Signed-off-by: Efraim Flashner --- gnu/packages/lua.scm | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) (limited to 'gnu/packages/lua.scm') diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index e40d28a473..2d43bc979c 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1171,7 +1171,7 @@ enabled.") (define-public fennel (package (name "fennel") - (version "0.9.1") + (version "1.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -1180,11 +1180,7 @@ enabled.") (file-name (git-file-name name version)) (sha256 (base32 - "07qgycf5cxm9zcc4fgpgvplg95ndavh3ynpdjpvzkikzbnyj7xia")) - (modules '((guix build utils))) - (snippet - '(begin - (delete-file "fennelview.lua") #t)))) + "0d4rpf0f2aqxlca3kxrbhjjhf1knhiz8ccwlx8xid05mc16la70y")))) (build-system gnu-build-system) (arguments '(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) @@ -1193,28 +1189,14 @@ enabled.") #:phases (modify-phases %standard-phases (delete 'configure) - (add-before 'build 'patch-lua-calls - (lambda* (#:key inputs #:allow-other-keys) - (let ((lua (string-append (assoc-ref inputs "lua") "/bin/lua"))) - (setenv "LUA" lua) - (substitute* "old/launcher.lua" - (("/usr/bin/env lua") lua)) - #t))) (add-after 'build 'patch-fennel (lambda* (#:key inputs #:allow-other-keys) (substitute* "fennel" (("/usr/bin/env .*lua") - (string-append (assoc-ref inputs "lua") "/bin/lua"))) - #t)) + (string-append (assoc-ref inputs "lua") "/bin/lua"))))) (delete 'check) (add-after 'install 'check - (assoc-ref %standard-phases 'check)) - (add-after 'install 'install-manpage - (lambda* (#:key outputs #:allow-other-keys) - (install-file "fennel.1" - (string-append (assoc-ref outputs "out") - "/share/man/man1")) - #t))))) + (assoc-ref %standard-phases 'check))))) (inputs `(("lua" ,lua))) (home-page "https://fennel-lang.org/") (synopsis "Lisp that compiles to Lua") -- cgit v1.2.3