From e9bd9a2d58001283e4be51bd6f67accb4c211c2e Mon Sep 17 00:00:00 2001 From: jgart Date: Thu, 14 Oct 2021 04:24:49 -0400 Subject: gnu: janet: Upgrade to 1.18.0. * gnu/packages/lisp.scm (janet): Upgrade to 1.18.0. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index b5aa6a087d..f81e55faaf 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Paul A. Patience ;;; Copyright © 2021 Charles Jackson +;;; Copyright © 2021 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -1155,7 +1156,7 @@ including a built-in database engine and a GUI system.") (define-public janet (package (name "janet") - (version "1.12.2") + (version "1.18.0") (source (origin (method git-fetch) @@ -1164,14 +1165,15 @@ including a built-in database engine and a GUI system.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0if514zdmbjvvrsa9x5yfvg2b14sz53yaka12g3yhwkq8ls3qk0c")))) + (base32 "1wd6b6dmcn6snw79vn5b74ff5mk97mdagav7vnxklqzlqislg9qq")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list - (string-append "DESTDIR=" (assoc-ref %outputs "out")) - (string-append "PREFIX=") - (string-append "CC=" (assoc-ref %build-inputs "gcc") - "/bin/gcc")) + `(#:make-flags + (list + (string-append "DESTDIR=" (assoc-ref %outputs "out")) + (string-append "PREFIX=") + (string-append "CC=" (assoc-ref %build-inputs "gcc") + "/bin/gcc")) #:phases (modify-phases %standard-phases (delete 'configure) -- cgit v1.2.3 From 90e92befbc8379b90ef58e4bbde975ba5a99d88c Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Fri, 15 Oct 2021 11:12:52 +0200 Subject: gnu: janet: Prepare for cross-compilation. * gnu/packages/lisp.scm (janet)[arguments]: Use 'cc-for-target'. Replace custom 'check' phase by 'test-target' parameter. --- gnu/packages/lisp.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index f81e55faaf..6e1b9c0244 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1172,14 +1172,11 @@ including a built-in database engine and a GUI system.") (list (string-append "DESTDIR=" (assoc-ref %outputs "out")) (string-append "PREFIX=") - (string-append "CC=" (assoc-ref %build-inputs "gcc") - "/bin/gcc")) + (string-append "CC=" ,(cc-for-target))) + #:test-target "test" #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'check - (lambda _ - (invoke "make" "test")))))) + (delete 'configure)))) (home-page "https://janet-lang.org/") (synopsis "Functional, imperative and embeddable programming language") (description -- cgit v1.2.3 From 06b46713a4f7f884ab641ebcad28e942d78a9e5f Mon Sep 17 00:00:00 2001 From: jgart Date: Sun, 17 Oct 2021 05:09:44 -0400 Subject: gnu: janet: Upgrade to 1.18.1. * gnu/packages/lisp.scm (janet): Upgrade to 1.18.1. Signed-off-by: Efraim Flashner --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 6e1b9c0244..76d6ecdc42 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1156,7 +1156,7 @@ including a built-in database engine and a GUI system.") (define-public janet (package (name "janet") - (version "1.18.0") + (version "1.18.1") (source (origin (method git-fetch) @@ -1165,7 +1165,7 @@ including a built-in database engine and a GUI system.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1wd6b6dmcn6snw79vn5b74ff5mk97mdagav7vnxklqzlqislg9qq")))) + (base32 "07k92ip4vmqpzbz32spkpy2rz7pxfsdyl77sy9fylqmc6vg32hr8")))) (build-system gnu-build-system) (arguments `(#:make-flags -- cgit v1.2.3