From 5111915e6afeb507a73a6ebe60e3fef754a3016a Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 25 Jan 2024 12:01:52 +0100 Subject: gnu: s7: Update to 24.1-0.23a64fa. * gnu/packages/lisp.scm (s7-bootstrap): Update to 24.1-0.23a64fa. Change-Id: I5853c2f4bb7f2f8c9c34fd8f3d358d94d287d14b --- gnu/packages/lisp.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 4f89779d8d..8e614b7d90 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1488,12 +1488,12 @@ (define-public eisl (define-public s7-bootstrap ;; Need s7-bootstrap to build libc_s7.so (for the REPL) and run tests - (let ((commit "618de30e0f9851515724245e3ebbfa1be4de6906") ;no releases + (let ((commit "23a64facfac06c4bc23a7de8f04691c55f88bd40") ;no releases (revision "0")) (hidden-package (package (name "s7-bootstrap") - (version (git-version "23.3" revision commit)) + (version (git-version "24.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -1502,7 +1502,7 @@ (define-public s7-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0kh1f49g24ppjpr16v1nc9lr7pvr5nzb82bpw8c6q8ll7pqalqaf")))) + "0fiw8lb7rswglixvn271la2q2hgwszrf2ckykhr6jjxdvmb9a7d0")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;no tests in bootstrap -- cgit v1.2.3 From f027a6c22c6cefe10cdd46821168bc9261111d5b Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Thu, 25 Jan 2024 12:29:30 +0100 Subject: gnu: s7: Compile with flint@3. * gnu/packages/patches/s7-flint-3.patch: New file. * gnu/local.mk (dist_patch_DATA): Register file. * gnu/packages/lisp.scm (s7-bootstrap)[source]: Add patch. [inputs]: Remove arb. Change-Id: I06bac9d850977b8ee769e629f1b64411a8dc3247 --- gnu/local.mk | 3 ++- gnu/packages/lisp.scm | 10 ++++++---- gnu/packages/patches/s7-flint-3.patch | 31 +++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/s7-flint-3.patch (limited to 'gnu/packages/lisp.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 43d02ee793..9eac0cae1a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1,6 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012-2024 Ludovic Courtès -# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023 Andreas Enge +# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023, 2024 Andreas Enge # Copyright © 2016 Mathieu Lirzin # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver # Copyright © 2016 Chris Marusich @@ -2003,6 +2003,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/rw-igraph-0.10.patch \ %D%/packages/patches/rxvt-unicode-fix-cursor-position.patch \ + %D%/packages/patches/s7-flint-3.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \ %D%/packages/patches/sbcl-aserve-fix-rfe12668.patch \ diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8e614b7d90..29d5ddebdc 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -25,7 +25,8 @@ ;;; Copyright © 2022 ( ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Yovan Naumovski -;;; Copyright © 2023 Andrew Kravchuk +;;; Copyright © 2024 Andreas Enge ;;; ;;; This file is part of GNU Guix. ;;; @@ -1502,7 +1503,8 @@ (define-public s7-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0fiw8lb7rswglixvn271la2q2hgwszrf2ckykhr6jjxdvmb9a7d0")))) + "0fiw8lb7rswglixvn271la2q2hgwszrf2ckykhr6jjxdvmb9a7d0")) + (patches (search-patches "s7-flint-3.patch")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;no tests in bootstrap @@ -1533,7 +1535,7 @@ (define-public s7-bootstrap (invoke #$(cc-for-target) "libarb_s7.c" "-I." "-O2" "-g" "-shared" "-o" "libarb_s7.so" - "-larb" "-lflint" "-lmpc" "-fPIC") + "-lflint" "-lmpc" "-fPIC") (display "[BUILD] libnotcurses_s7.so\n") (invoke #$(cc-for-target) "notcurses_s7.c" "-I." "-O2" "-g" @@ -1572,7 +1574,7 @@ (define-public s7-bootstrap (install-file "s7.c" share) (install-file "s7.h" inc) (install-file "s7.html" doc))))))) - (inputs (list arb flint mpc notcurses)) + (inputs (list flint mpc notcurses)) (home-page "https://ccrma.stanford.edu/software/snd/snd/s7.html") (synopsis "Scheme interpreter intended as an extension language") (description diff --git a/gnu/packages/patches/s7-flint-3.patch b/gnu/packages/patches/s7-flint-3.patch new file mode 100644 index 0000000000..49f47adda1 --- /dev/null +++ b/gnu/packages/patches/s7-flint-3.patch @@ -0,0 +1,31 @@ +From bd54bd42c5933e4c571dcfd6a8afac8e52cf7366 Mon Sep 17 00:00:00 2001 +From: Andreas Enge +Date: Thu, 25 Jan 2024 12:13:18 +0100 +Subject: [PATCH] Adapt libarb_s7.c to FLINT 3. + +--- + libarb_s7.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libarb_s7.c b/libarb_s7.c +index 7413ccc..d9e0084 100644 +--- a/libarb_s7.c ++++ b/libarb_s7.c +@@ -6,10 +6,10 @@ + #include + #include + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #define WITH_GMP 1 + #include "s7.h" +-- +2.41.0 + -- cgit v1.2.3 From 5d2302a1959d09e6d5a5f02ac199458095847a82 Mon Sep 17 00:00:00 2001 From: unwox Date: Mon, 5 Feb 2024 22:45:21 +0600 Subject: gnu: janet: Update to 1.33.0 * gnu/packages/lisp.scm (janet): Update to 1.33.0. Change-Id: Ic5dd8b0c7042fe965c940d291331803f7f28e3f2 Signed-off-by: Guillaume Le Vaillant --- 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 29d5ddebdc..c58e56b7a7 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1242,7 +1242,7 @@ (define-public picolisp (define-public janet (package (name "janet") - (version "1.32.1") + (version "1.33.0") (source (origin (method git-fetch) @@ -1251,7 +1251,7 @@ (define-public janet (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1nnqbpql6749597m0lp56i2zqm003pg690399l0g8kb9kwvpv1yv")))) + (base32 "16wgljca7hp29fz5p2dnvy2cbscjx4imf85rhjwc1jkgdjswjxli")))) (build-system gnu-build-system) (arguments (list #:make-flags -- cgit v1.2.3