From 973c6f18eb5ac6ee76f742f06ba1589759f4d4bd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 8 Mar 2021 16:12:13 +0100 Subject: gnu: guile-next: Reintroduce as a 3.0.x snapshot. * gnu/packages/guile.scm (guile-next): Rewrite as a 3.0.x snapshot. --- gnu/packages/guile.scm | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 6662315e78..650fe1289a 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2014 Cyril Roelandt ;;; Copyright © 2014, 2016, 2018 David Thompson ;;; Copyright © 2014, 2017, 2018 Mark H Weaver @@ -44,6 +44,7 @@ #:use-module (gnu packages flex) #:use-module (gnu packages gawk) #:use-module (gnu packages gettext) + #:use-module (gnu packages gperf) #:use-module (gnu packages hurd) #:use-module (gnu packages libffi) #:use-module (gnu packages libunistring) @@ -324,9 +325,6 @@ without requiring the source code to be rewritten.") ;; Remove on the next rebuild cycle. (search-patches "guile-2.2-skip-so-test.patch"))) -(define-public guile-next - (deprecated-package "guile-next" guile-3.0)) - (define-public guile-3.0/libgc-7 ;; Using libgc-7 avoid crashes that can occur, particularly when loading ;; data in to the Guix Data Service: @@ -348,6 +346,44 @@ without requiring the source code to be rewritten.") (max-silent-time . 36000))))) ;10 hours (needed on ARM ; when heavily loaded) +(define-public guile-next + (let ((version "3.0.5") + (revision "0") + (commit "91547abf54d5e0795afda2781259ab8923eb527b")) + (package + (inherit guile-3.0) + (name "guile-next") + (version (git-version version revision commit)) + (source (origin + ;; The main goal here is to allow for '--with-branch'. + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/guile.git") + (commit commit))) + (sha256 + (base32 + "09i1c77h2shygylfk0av31jsc1my6zjl230b2cx6vyl58q8c0cqy")))) + (arguments + (substitute-keyword-arguments (package-arguments guile-3.0) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-before 'check 'skip-failing-tests + (lambda _ + (substitute* "test-suite/standalone/test-out-of-memory" + (("!#") "!#\n\n(exit 77)\n")) + (delete-file "test-suite/tests/version.test") + #t)))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("flex" ,flex) + ("gettext" ,gnu-gettext) + ("texinfo" ,texinfo) + ("gperf" ,gperf) + ,@(package-native-inputs guile-3.0))) + (synopsis "Development version of GNU Guile")))) + (define* (make-guile-readline guile #:optional (name "guile-readline")) (package (name name) -- cgit v1.2.3 From b1eb7448370bbd4d494cf9f3fddae88dd0de2ca3 Mon Sep 17 00:00:00 2001 From: Taylan Kammer Date: Wed, 10 Mar 2021 19:55:35 +0100 Subject: gnu: guile-bytestructures: Update to 1.0.10. * gnu/packages/guile.scm (guile-bytestructures): Update to 1.0.10. Signed-off-by: Tobias Geerinckx-Rice See: --- gnu/packages/guile.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 650fe1289a..8bf250a625 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -725,7 +725,7 @@ Guile's foreign function interface.") (define-public guile-bytestructures (package (name "guile-bytestructures") - (version "1.0.9") + (version "1.0.10") (home-page "https://github.com/TaylanUB/scheme-bytestructures") (source (origin (method git-fetch) @@ -735,7 +735,7 @@ Guile's foreign function interface.") (file-name (git-file-name name version)) (sha256 (base32 - "0r59sqrvwbsknw21bf44bppi6wdhd2rl2v5dw9i2vij3v8w7pgkm")))) + "14k50jln32kkxv41hvsdgjkkfj6xlv06vc1caz01qkgk1fzh72nk")))) (build-system gnu-build-system) (arguments `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings -- cgit v1.2.3 From 97b45977f49470d70070b2ae4c66c5b802b172a1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 12 Mar 2021 14:35:51 +0100 Subject: gnu: guile-zlib: Update to 0.1.0. * gnu/packages/guile.scm (guile-zlib): Update to 0.1.0. --- gnu/packages/guile.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/guile.scm') diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 8bf250a625..0dad390275 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -815,7 +815,7 @@ manipulate repositories of the Git version control system.") (define-public guile-zlib (package (name "guile-zlib") - (version "0.0.1") + (version "0.1.0") (source (origin ;; XXX: Do not use "git-fetch" method here that would create and @@ -823,12 +823,13 @@ manipulate repositories of the Git version control system.") ;; in the same method. (method url-fetch) (uri - (string-append "https://notabug.org/guile-zlib/guile-zlib/archive/" + (string-append "https://notabug.org/guile-zlib/guile-zlib/archive/v" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz")) (sha256 + ;; content hash: 1ip18nzwnczqyhn9cpzxkm9vzpi5fz5sy96cgjhmp7cwhnkmv6zv (base32 - "1caz6cbl6sg5567nk68z88rshp0m26zmb0a9ry1jkc1ivpk0n47i")))) + "1safz7rrbdf1d98x3lgx5v74kivpyf9n1v6pdyy22vd0f2sjdir5")))) (build-system gnu-build-system) (arguments '(#:make-flags -- cgit v1.2.3