From a0b24d5f8c5813329986b1bd690ed50b5308cc78 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Tue, 23 Feb 2021 20:02:14 +0000 Subject: gnu: guile-lib: Fix cross compilation. These changes were sent upstream as https://lists.gnu.org/archive/html/guile-devel/2021-02/msg00004.html Without this change, the .go files are built for the host architecture, rather than the target. I noticed this when cross building the guix-build-coordinator (for which guile-lib is an input) to the Hurd. * gnu/packages/guile-xyz.scm (guile-lib)[arguments]: Add 'patch-for-cross-compilation phase. [native-inputs]: Add autoconf, automake and gettext. (guile2.0-lib): Adjust to use alist-replace. (guile2.2-lib): Adjust to use alist-replace. --- gnu/packages/guile-xyz.scm | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'gnu/packages/guile-xyz.scm') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 45b3a82d00..bd26010918 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -116,6 +116,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system guile) #:use-module (guix utils) + #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (ice-9 match) #:use-module ((srfi srfi-1) #:select (alist-delete))) @@ -2191,6 +2192,21 @@ library.") '("GUILE_AUTO_COMPILE=0") ; to prevent guild errors #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-for-cross-compilation + (lambda _ + (substitute* "configure.ac" + (("GUILE_FLAGS") + "GUILE_FLAGS +if test \"$cross_compiling\" != no; then + GUILE_TARGET=\"--target=$host_alias\" + AC_SUBST([GUILE_TARGET]) +fi +")) + (substitute* "am/guile.mk" + (("guild compile") "guild compile $(GUILE_TARGET)")) + (delete-file "configure") ; trigger the bootstrap phase to run + ; autoreconf + #t)) (add-before 'configure 'patch-module-dir (lambda _ (substitute* "src/Makefile.in" @@ -2201,7 +2217,10 @@ library.") $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) #t))))) (native-inputs - `(("guile" ,guile-3.0) + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("guile" ,guile-3.0) ("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-3.0))) @@ -2222,15 +2241,23 @@ for Guile\".") (package (inherit guile-lib) (name "guile2.0-lib") - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.0))))) + (native-inputs + (alist-replace "guile" (list guile-2.0) + (package-native-inputs guile-lib))) + (inputs + (alist-replace "guile" (list guile-2.0) + (package-inputs guile-lib))))) (define-public guile2.2-lib (package (inherit guile-lib) (name "guile2.2-lib") - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.2))))) + (native-inputs + (alist-replace "guile" (list guile-2.2) + (package-native-inputs guile-lib))) + (inputs + (alist-replace "guile" (list guile-2.2) + (package-inputs guile-lib))))) (define-public guile3.0-lib (deprecated-package "guile3.0-lib" guile-lib)) -- cgit v1.2.3 From 0d5e2c587f5ac58f7a4f810629692e05255c804c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 10 Mar 2021 08:40:34 +0100 Subject: gnu: guile-simple-zmq: Update to 0.0.0-9.b2ea97e. * gnu/packages/guile-xyz.scm (guile-simple-zmq): Update to 0.0.0-9.b2ea97e. --- gnu/packages/guile-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/guile-xyz.scm') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index bd26010918..115c3d82f5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1002,8 +1002,8 @@ convenient nested tree operations.") (license license:gpl3+))) (define-public guile-simple-zmq - (let ((commit "e9446173280117e98ab4208e2aa5273128650e19") - (revision "8")) + (let ((commit "b2ea97e5a0e7417ce718b27b6fd55a3146364b82") + (revision "9")) (package (name "guile-simple-zmq") (version (git-version "0.0.0" revision commit)) @@ -1015,7 +1015,7 @@ convenient nested tree operations.") (commit commit))) (sha256 (base32 - "1nhlp5kl1095k1irvv0kgdbc7lp5qki3d3wg9rla6f7822hkmrzw")) + "08qvcxx0njz9545xa0lq3wpf55v9cl9nbb640ry1lig11wpymqxb")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments -- cgit v1.2.3 From aa0598974b9c454dcce0a7a4aba1a0198bce8b93 Mon Sep 17 00:00:00 2001 From: Xinglu Chen Date: Fri, 5 Mar 2021 23:04:19 +0100 Subject: gnu: Add guile-f-scm. * gnu/packages/guile-xyz.scm (guile-f-scm): New variable. Signed-off-by: Nicolas Goaziou --- gnu/packages/guile-xyz.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/guile-xyz.scm') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 115c3d82f5..4799711c66 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -34,6 +34,7 @@ ;;; Copyright © 2020 Leo Prikler ;;; Copyright © 2020, 2021 pukkamustard ;;; Copyright © 2021 Bonface Munyoki Kilyungi +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -237,6 +238,30 @@ more.") (home-page "https://www.gnu.org/software/artanis/") (license (list license:gpl3+ license:lgpl3+)))) ;dual license +(define-public guile-f-scm + (package + (name "guile-f-scm") + (version "0.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~brown121407/f.scm") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14wyrs3m1649l3km4pl2175dmap1372j5h8nkhykrbxg5xqp6ivd")))) + (build-system guile-build-system) + (native-inputs + `(("guile" ,guile-3.0))) + (home-page "https://git.sr.ht/~brown121407/f.scm") + (synopsis "Library for working with files and directories") + (description + "f.scm is a library intended to facilitate working with files and +directories (the file system in general). It was initially inspired by the +f library for Emacs.") + (license license:gpl3+))) + ;; There has not been any release yet. (define-public guildhall (let ((commit "2fe2cc539f4b811bbcd69e58738db03eb5a2b778") -- cgit v1.2.3 From 714a8faa0469b4c79a0694f1451e7b1a6214d12f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 15 Mar 2021 10:34:24 +0100 Subject: gnu: guile-email-latest: Update to 0.2.2-1.ca0520a. * gnu/packages/guile-xyz.scm (guile-email-latest): Update to 0.2.2-1.ca0520a. --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/guile-xyz.scm') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 4799711c66..2e02f6f482 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1237,7 +1237,7 @@ format.") (license license:agpl3+))) (define-public guile-email-latest - (let ((commit "03e9cacb826bd4a56d3d834fe5526e497d7c57eb") + (let ((commit "ca0520a33c9042a68691d85c6849f88412ca8357") (revision "1")) (package (inherit guile-email) @@ -1252,7 +1252,7 @@ format.") (file-name (git-file-name name version)) (sha256 (base32 - "1a15gdlbmzx220xg82fgyd0zk2wqn13ddmzs13nhgfzx8d5cns68")))) + "1l5mikalawq83786rnb9zky908ncsd5dna9vyz6bx6kc2frrl7xv")))) (native-inputs `(("pkg-config" ,pkg-config) ("autoconf" ,autoconf) -- cgit v1.2.3 From ce10e2b3e93476a89cf85838fa21bb8b54268b1f Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Mon, 22 Feb 2021 16:43:10 +0100 Subject: gnu: Use autoconf instead of autoconf-wrapper when possible. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This should reduce confusion on when to use the "autoconf" package and when to use "autoconf-wrapper" instead in package definitions. Fixes . * gnu/packages/autotools.scm (autoconf-wrapper): advise to use the "autoconf" package instead where possible. * gnu/packages/game-development.scm (tsukundere)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/gimp.scm (glimpse)[native-inputs]: likewise. (gimp-resynthesizer)[native-inputs]: add comment on why "autoconf-wrapper" is used. * gnu/packages/gnunet.scm (gnunet)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/gnupg.scm (signing-party)[native-inputs]: add comment on why "autoconf-wrapper" is used. * gnu/packages/guile-xyz.scm (guile-bash,guile-filesystem,guile-ics,guile-udev)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/libevent.scm (libuv)[native-inputs]: indicates "autoconf-wrapper" needs to be replaced with "autoconf" on core-updates. * gnu/packages/logging.scm (glog)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/mail.scm (libetpan)[native-inputs]: likewise. * gnu/packages/mate.scm (mate-icon-theme-faenza)[native-inputs]: add comment on why "autoconf-wrapper" is used. (mate-screensaver)[native-inputs]: use "autoconf" instead of "autoconf-wrapper". * gnu/packages/package-management.scm (guix)[native-inputs]: likewise. * gnu/packages/sawfish.scm (librep)[native-inputs]: likewise. * gnu/packages/video.scm (motion)[native-inputs]: likewise. * gnu/packages/zile.scm (zile)[native-inputs]: likewise. Signed-off-by: Ludovic Courtès --- gnu/packages/autotools.scm | 2 ++ gnu/packages/game-development.scm | 2 +- gnu/packages/gimp.scm | 4 +++- gnu/packages/gnunet.scm | 2 +- gnu/packages/gnupg.scm | 2 ++ gnu/packages/guile-xyz.scm | 8 ++++---- gnu/packages/libevent.scm | 1 + gnu/packages/logging.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/mate.scm | 4 +++- gnu/packages/package-management.scm | 2 +- gnu/packages/sawfish.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/zile.scm | 2 +- 14 files changed, 23 insertions(+), 14 deletions(-) (limited to 'gnu/packages/guile-xyz.scm') diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index e999688894..12a36a4709 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -267,6 +267,8 @@ exec ~a --no-auto-compile \"$0\" \"$@\" ;; Do not show it in the UI since it's meant for internal use. (properties '((hidden? . #t))))) +;; Only use this package when autoconf is not usable, +;; see . (define-public autoconf-wrapper (make-autoconf-wrapper autoconf)) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 7e17142b9e..6d88c3d73b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -529,7 +529,7 @@ clone.") all))) #t)))))) (native-inputs - `(("autoconf" ,autoconf-wrapper) + `(("autoconf" ,autoconf) ("automake" ,automake) ("guile" ,guile-3.0) ("pkg-config" ,pkg-config) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index ddd9158f56..5d005e0378 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -518,6 +518,8 @@ MyPaint.") (mkdir-p target) #t)))))) (native-inputs + ;; avoid ./autogen.sh: ./configure: /bin/sh: bad interpreter: + ;; No such file or directory `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("glib" ,glib "bin") ; glib-gettextize @@ -590,7 +592,7 @@ transferring the style of an image.") (format port "for dir in '~a'.split(':'):~%" pythonpath) (format port " site.addsitedir(dir)~%"))))))))) (native-inputs - `(("autoconf" ,autoconf-wrapper) + `(("autoconf" ,autoconf) ("automake" ,automake) ("gtk-doc" ,gtk-doc) ("intltool" ,intltool) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 80e4aba29b..d261f42dcc 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -368,7 +368,7 @@ kinds of basic applications for the foundation of a GNU internet.") "0nqc18jh9j30y4l6yh6j35byfg6qalq7yr3frv9rk10qa041c2sv")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("automake" ,automake))) (inputs `(("guile" ,guile-2.0) ("gnunet" ,gnunet))) diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index f97dd6c4a7..bb611bdb89 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -695,6 +695,8 @@ PGP keysigning parties.") "1aig5ssabzbk4mih7xd04vgr931bw0flbi8dz902wlr610gyv5s5")))) (build-system gnu-build-system) (native-inputs + ;; autoconf-wrapper is required due to the non-standard + ;; 'configure phase. `(("autoconf" ,autoconf-wrapper) ("automake" ,automake))) (inputs `(("perl" ,perl) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 2e02f6f482..6493fe6048 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -393,7 +393,7 @@ dictionary and suggesting spelling corrections.") (string-append "--libdir=" (assoc-ref %outputs "out") "/lib/bash")))) (native-inputs `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'. @@ -660,7 +660,7 @@ is not available for Guile 2.0.") "1shmkc0y9r2sj3kw7hrsnamnp7y8xifkhf3m3rnfxczqg63k67vy")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf-wrapper) + `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo))) @@ -1723,7 +1723,7 @@ provides tight coupling to Guix.") #t)))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf-wrapper) + `(("autoconf" ,autoconf) ("automake" ,automake) ("texinfo" ,texinfo) ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'. @@ -1856,7 +1856,7 @@ users and in some situations.") "1l6csncjqnx58c6c3wdl7rshnhk4pzhjq2q8lnkg483564s9w5py")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf-wrapper) + `(("autoconf" ,autoconf) ("automake" ,automake) ("gettext" ,gettext-minimal) ("libtool" ,libtool) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index dab574a155..7109d9a88d 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -115,6 +115,7 @@ limited support for fork events.") '(#:configure-flags '("--disable-static") ;; XXX: Some tests want /dev/tty, attempt to make connections, etc. #:tests? #f)) + ;; TODO replace with autoconf on core-updates (native-inputs `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("libtool" ,libtool) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index 87283f3752..eafc23b2e6 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -99,7 +99,7 @@ staying as close to their API as is reasonable.") #t))))) (native-inputs `(("perl" ,perl) ;for tests - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool))) (synopsis "C++ logging library") diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b02f547e03..239ddb0eb0 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1476,7 +1476,7 @@ useful features.") (sha256 (base32 "0g7an003simfdn7ihg9yjv7hl2czsmjsndjrp39i7cad8icixscn")))) (build-system gnu-build-system) - (native-inputs `(("autoconf" ,autoconf-wrapper) + (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index a9635d90fe..fbb1a74d09 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -176,6 +176,8 @@ actions.") (setenv "CONFIG_SHELL" (which "sh")) (invoke "sh" "autogen.sh")))))) (native-inputs + ;; autoconf-wrapper is required due to the non-standard + ;; 'autoconf phase. `(("autoconf" ,autoconf-wrapper) ("automake" ,automake) ("intltool" ,intltool) @@ -1201,7 +1203,7 @@ Re-decorates windows on un-maximise. (("dbus-1") "")))))))) (native-inputs `(("automake" ,automake) - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("gettext" ,gettext-minimal) ("intltool" ,intltool) ("mate-common" ,mate-common) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 49067850c1..6a7285f33e 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -379,7 +379,7 @@ $(prefix)/etc/init.d\n"))) ;; XXX: Keep the development inputs here even though ;; they're unnecessary, just so that 'guix environment ;; guix' always contains them. - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("automake" ,automake) ("gettext" ,gettext-minimal) ("texinfo" ,texinfo) diff --git a/gnu/packages/sawfish.scm b/gnu/packages/sawfish.scm index 26d8eba3b6..4162fe43cd 100644 --- a/gnu/packages/sawfish.scm +++ b/gnu/packages/sawfish.scm @@ -53,7 +53,7 @@ `(("makeinfo" ,texinfo) ("pkg-config" ,pkg-config) - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool))) (inputs diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index eb1c329c1b..dbe042c0d9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4265,7 +4265,7 @@ It counts more than 100 plugins.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf-wrapper) + `(("autoconf" ,autoconf) ("automake" ,automake) ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/zile.scm b/gnu/packages/zile.scm index 6169815520..c28bc1bdd1 100644 --- a/gnu/packages/zile.scm +++ b/gnu/packages/zile.scm @@ -120,7 +120,7 @@ default Emacs configuration, but it carries a much lighter feature set.") ,@(package-inputs zile))) (native-inputs `(("m4" ,m4) ;for 'bootstrap' - ("autoconf" ,autoconf-wrapper) + ("autoconf" ,autoconf) ("automake" ,automake) ;; For some reason, 'bootstrap' insists on having these. -- cgit v1.2.3 From bb8a0d8057be204ff507ef01a082335a1620f075 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 18 Mar 2021 21:05:58 +0100 Subject: gnu: emacsy-minimal: Fix build. * gnu/packages/guile-xyz.scm (emacsy-minimal)[native-inputs]: Add autoconf, automake, gettext-minimal, libtool, pkg-config, and texinfo. --- gnu/packages/guile-xyz.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/guile-xyz.scm') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 6493fe6048..d89b9954de 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020 Mathieu Othacehe ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Nikita -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2018 Maxim Cournoyer ;;; Copyright © 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby @@ -3306,6 +3306,13 @@ in C using Gtk+-3 and WebKitGtk.") (sha256 (base32 "03ym14g9qhjqmryr5z065kynqm8yhmvnbs2djl6vp3i9cmqln8cl")))) (build-system gnu-build-system) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("libtool" ,libtool) + ("makeinfo" ,texinfo) + ("pkg-config" ,pkg-config))) (inputs `(("guile" ,guile-2.2) ("guile-lib" ,guile2.2-lib) -- cgit v1.2.3 From cec4f5f556246dd48c89234d635f0a7124f57a55 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 3 Mar 2021 16:20:22 -0500 Subject: gnu: guile-lib: Update to 0.2.7. * gnu/packages/guile-xyz.scm (guile-lib): Remove trailing #t. [source]: Remove snippet and modules field. [phases]{patch-for-cross-compilation}: Remove phase. [native-inputs]: Add pkg-config. --- gnu/packages/guile-xyz.scm | 41 ++++++----------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) (limited to 'gnu/packages/guile-xyz.scm') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index d89b9954de..9f4118f083 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -16,7 +16,7 @@ ;;; Copyright © 2017 Theodoros Foradis ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice -;;; Copyright © 2018 Maxim Cournoyer +;;; Copyright © 2018, 2021 Maxim Cournoyer ;;; Copyright © 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2018 Eric Bavier @@ -2192,46 +2192,19 @@ library.") (define-public guile-lib (package (name "guile-lib") - (version "0.2.6.1") + (version "0.2.7") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/guile-lib/guile-lib-" version ".tar.gz")) (sha256 (base32 - "0aizxdif5dpch9cvs8zz5g8ds5s4xhfnwza2il5ji7fv2h7ks7bd")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Work around miscompilation on Guile 3.0.0 at -O2: - ;; . - (substitute* "src/md5.scm" - (("\\(define f-ash ash\\)") - "(define f-ash (@ (guile) ash))\n") - (("\\(define f-add \\+\\)") - "(define f-add (@ (guile) +))\n")) - #t)))) + "1ph4z4a64m75in36pdb4dw63dzdq3hdgh16gq33q460jby23pvz4")))) (build-system gnu-build-system) (arguments - '(#:make-flags - '("GUILE_AUTO_COMPILE=0") ; to prevent guild errors + '(#:make-flags '("GUILE_AUTO_COMPILE=0") ;placate guild warnings #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-for-cross-compilation - (lambda _ - (substitute* "configure.ac" - (("GUILE_FLAGS") - "GUILE_FLAGS -if test \"$cross_compiling\" != no; then - GUILE_TARGET=\"--target=$host_alias\" - AC_SUBST([GUILE_TARGET]) -fi -")) - (substitute* "am/guile.mk" - (("guild compile") "guild compile $(GUILE_TARGET)")) - (delete-file "configure") ; trigger the bootstrap phase to run - ; autoreconf - #t)) (add-before 'configure 'patch-module-dir (lambda _ (substitute* "src/Makefile.in" @@ -2239,8 +2212,7 @@ fi "moddir = $(datadir)/guile/site/@GUILE_EFFECTIVE_VERSION@\n") (("^godir = ([[:graph:]]+)") "godir = \ -$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) - #t))))) +$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -2248,7 +2220,7 @@ $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) ("guile" ,guile-3.0) ("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-3.0))) + `(("guile" ,guile-3.0))) ;for cross-compilation (home-page "https://www.nongnu.org/guile-lib/") (synopsis "Collection of useful Guile Scheme modules") (description @@ -2256,7 +2228,6 @@ $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) modules, allowing for people to cooperate integrating their generic Guile modules into a coherent library. Think \"a down-scaled, limited-scope CPAN for Guile\".") - ;; The whole is under GPLv3+, but some modules are under laxer ;; distribution terms such as LGPL and public domain. See `COPYING' for ;; details. -- cgit v1.2.3 From 4cd88522f233dcb9affa3d3b0eada154439487c1 Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 9 Mar 2021 14:39:24 -0500 Subject: gnu: Add guile-quickcheck. * gnu/packages/guile-xyz.scm (guile-quickcheck): New variable. --- gnu/packages/guile-xyz.scm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'gnu/packages/guile-xyz.scm') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9f4118f083..28e7c798a7 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -22,7 +22,7 @@ ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 swedebugia ;;; Copyright © 2019, 2020 Amar Singh -;;; Copyright © 2019 Timothy Sample +;;; Copyright © 2019, 2021 Timothy Sample ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2020 Evan Straw ;;; Copyright © 2020 Jack Hill @@ -4619,3 +4619,28 @@ binary which is smaller and faster to generate and parse. This package provides a Guile implementation of CBOR.") (home-page "https://inqlab.net/git/guile-cbor.git") (license license:gpl3+))) + +(define-public guile-quickcheck + (package + (name "guile-quickcheck") + (version "0.1.0") + (source (origin + (method url-fetch) + (uri (string-append "https://files.ngyro.com/" + "guile-quickcheck/guile-quickcheck-" + version ".tar.gz")) + (sha256 + (base32 + "03mwi1l3354x52nar0zwhcm0x29yai9xjln4p4gbchwvx5dsr6fb")))) + (build-system gnu-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("guile" ,guile-3.0))) + (home-page "https://ngyro.com/software/guile-quickcheck.html") + (synopsis "Randomized property-based testing for Guile") + (description "Guile-Quickcheck is a library for random testing of program +properties inspired by ghc-quickcheck. You can use it to express properties, +which functions should satisfy, as Scheme code and then check whether they hold +in a large number of randomly generated test cases.") + (license license:gpl3+))) -- cgit v1.2.3 From 69b3907adf6864e5d133797f1dad51d5a974c796 Mon Sep 17 00:00:00 2001 From: Leo Le Bouter Date: Mon, 8 Feb 2021 01:30:43 +0100 Subject: gnu: guile-avahi: Fix compilation on powerpc64le-linux. * gnu/packages/guile-xyz.scm (guile-avahi)[arguments]: Parallel builds fail on powerpc64le-linux. Set "#:parallel-build?" to "#f". Signed-off-by: Chris Marusich --- gnu/packages/guile-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/guile-xyz.scm') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 28e7c798a7..461b9e04bf 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2020, 2021 pukkamustard ;;; Copyright © 2021 Bonface Munyoki Kilyungi ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Leo Le Bouter ;;; ;;; This file is part of GNU Guix. ;;; @@ -4262,6 +4263,9 @@ errors.") ,@%gnu-build-system-modules) #:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings + ;; Parallel builds fail on powerpc64le-linux. + ;; See https://lists.nongnu.org/archive/html/guile-avahi-bugs/2021-01/msg00000.html + #:parallel-build? #f #:phases (modify-phases %standard-phases (add-before 'check 'fix-guile-avahi-file-name -- cgit v1.2.3