diff options
Diffstat (limited to 'gnu/packages/guile-xyz.scm')
| -rw-r--r-- | gnu/packages/guile-xyz.scm | 1479 |
1 files changed, 751 insertions, 728 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 6936e9699b..e2cf793acc 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Erik Edrosa <erik.edrosa@gmail.com> ;;; Copyright © 2016, 2019, 2020, 2021 Eraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2016, 2017 Alex Kost <alezost@gmail.com> +;;; Copyright © 2016, 2017, 2021 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017 Adonay "adfeno" Felipe Nogueira <https://libreplanet.org/wiki/User:Adfeno> <adfeno@openmailbox.org> ;;; Copyright © 2016, 2021 Amirouche <amirouche@hypermove.net> ;;; Copyright © 2016, 2019, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> @@ -17,7 +17,7 @@ ;;; Copyright © 2017 Nikita <nikita@n0.is> ;;; Copyright © 2017, 2018, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> -;;; Copyright © 2018, 2019, 2020, 2021 Arun Isaac <arunisaac@systemreboot.net> +;;; Copyright © 2018, 2019, 2020, 2021, 2022 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2019 swedebugia <swedebugia@riseup.net> @@ -38,6 +38,7 @@ ;;; Copyright © 2021 Leo Le Bouter <lle-bout@zaclys.net> ;;; Copyright © 2021 Zelphir Kaltstahl <zelphirkaltstahl@posteo.de> ;;; Copyright © 2021 Oleg Pykhalov <go.wigust@gmail.com> +;;; Copyright © 2021, 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ (define-module (gnu packages guile-xyz) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages admin) #:use-module (gnu packages algebra) #:use-module (gnu packages aspell) #:use-module (gnu packages autotools) @@ -167,17 +169,13 @@ #t)))) (build-system gnu-build-system) (inputs - `(("guile" ,guile-3.0) - ("nspr" ,nspr) - ("nss" ,nss))) + (list guile-3.0 nspr nss)) ;; FIXME the bundled csv contains one more exported procedure ;; (sxml->csv-string) than guile-csv. The author is maintainer of both ;; projects. ;; TODO: Add guile-dbi and guile-dbd optional dependencies. (propagated-inputs - `(("guile-json" ,guile-json-3) - ("guile-readline" ,guile-readline) - ("guile-redis" ,guile-redis))) + (list guile-json-3 guile-readline guile-redis)) (native-inputs `(("bash" ,bash) ;for the `source' builtin ("pkgconfig" ,pkg-config) @@ -274,7 +272,7 @@ more.") (base32 "038gwrhfywgs8372q478wn4623lhcmkknfj4p8yaa93bykfc0fml")))) (build-system guile-build-system) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://github.com/joshwalters/guile-pipe") (synopsis "Guile pipe macros for functional chaining") (description @@ -298,7 +296,7 @@ to UNIX pipes (@code{|}), Clojure's threading macros (@code{->} and (base32 "14wyrs3m1649l3km4pl2175dmap1372j5h8nkhykrbxg5xqp6ivd")))) (build-system guile-build-system) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://git.sr.ht/~brown121407/f.scm") (synopsis "Library for working with files and directories") (description @@ -343,12 +341,10 @@ AM_SCM_LOG_FLAGS = --no-auto-compile -s") (("tests/database.scm") "")) #t))))) (inputs - `(("guile" ,guile-2.0))) + (list guile-2.0)) (native-inputs - `(("zip" ,zip) ; for tests - ("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo))) + (list zip ; for tests + autoconf automake texinfo)) (synopsis "Package manager for Guile") (description "Guildhall is a package manager written for Guile Scheme. A guild is @@ -394,9 +390,8 @@ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) (string-append "\"" aspell "/lib/libaspell\""))) #t)))))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-2.2) - ("aspell" ,aspell))) + (native-inputs (list pkg-config)) + (inputs (list guile-2.2 aspell)) (home-page "https://github.com/spk121/guile-aspell") (synopsis "Spell-checking from Guile") (description @@ -504,11 +499,7 @@ and then run @command{scm example.scm}.") (base32 "031wm13srak3wsnll7j2mbbi29g1pcm4swdb71ds9yn567pn20qw")))) (build-system gnu-build-system) - (native-inputs `(("autoconf" ,autoconf) - ("automake" ,automake) - ("guile" ,guile-2.2) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + (native-inputs (list autoconf automake guile-2.2 pkg-config texinfo)) (arguments `(#:phases (modify-phases %standard-phases (add-before 'configure 'setenv @@ -540,9 +531,9 @@ Note that 8sync is only available for Guile 2.2.") "08gaqrgjlly9k5si72vvpbr4xhq5v52l5ma5y6a7spid5dd057cy")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("guile" ,guile-2.2))) + (list guile-3.0)) (home-page "https://github.com/alezost/guile-daemon") (synopsis "Evaluate code in a running Guile process") (description @@ -554,7 +545,7 @@ you send to a FIFO file.") (define-public guile-dsv (package (name "guile-dsv") - (version "0.4.0") + (version "0.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -563,15 +554,12 @@ you send to a FIFO file.") (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "1mvyc8i38j56frjh3p6vwziv8lrzlyqndz30663h5nwcp0044sdn")))) + "0s9zan08ala7432pn44z3vmb3sc19rf18zfr9mskydnam5xn6qlw")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-3.0))) - (propagated-inputs `(("guile-lib" ,guile-lib))) + (list autoconf automake pkg-config texinfo)) + (inputs (list guile-3.0)) + (propagated-inputs (list guile-lib)) (arguments `(#:modules (((guix build guile-build-system) #:select (target-guile-effective-version)) @@ -579,21 +567,6 @@ you send to a FIFO file.") #:imported-modules ((guix build guile-build-system) ,@%gnu-build-system-modules) #:phases (modify-phases %standard-phases - (add-before 'configure 'set-guilesitedir - (lambda _ - (substitute* "Makefile.in" - (("^guilesitedir =.*$") - "guilesitedir = \ -$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) - (substitute* "modules/Makefile.in" - (("^guilesitedir =.*$") - "guilesitedir = \ -$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) - (substitute* "modules/dsv/Makefile.in" - (("^guilesitedir =.*$") - "guilesitedir = \ -$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) - #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -624,7 +597,7 @@ Unix-style DSV format and RFC 4180 format.") (package (inherit guile-dsv) (name "guile2.2-dsv") - (inputs `(("guile" ,guile-2.2))) + (inputs (list guile-2.2)) (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) (define-public guile-fibers @@ -681,10 +654,9 @@ Unix-style DSV format and RFC 4180 format.") (rename-file old new) #t)))))) (native-inputs - `(("texinfo" ,texinfo) - ("pkg-config" ,pkg-config))) + (list texinfo pkg-config)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (synopsis "Lightweight concurrency facility for Guile") (description "Fibers is a Guile library that implements a a lightweight concurrency @@ -704,10 +676,7 @@ is not available for Guile 2.0.") (package (inherit guile-fibers) (name "guile2.2-fibers") - (inputs `(("guile" ,guile-2.2))))) - -(define-public guile3.0-fibers - (deprecated-package "guile3.0-fibers" guile-fibers)) + (inputs (list guile-2.2)))) (define-public guile-filesystem (package @@ -724,12 +693,9 @@ is not available for Guile 2.0.") "1shmkc0y9r2sj3kw7hrsnamnp7y8xifkhf3m3rnfxczqg63k67vy")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + (list autoconf automake pkg-config texinfo)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://gitlab.com/leoprikler/guile-filesystem") (synopsis "Complementary library to Guile's built-in file system procedures") (description "@code{guile-filesystem} provides a set of utility functions, @@ -740,13 +706,13 @@ that augment Guile's support for handling files and their names.") (package (inherit guile-filesystem) (name "guile2.0-filesystem") - (inputs `(("guile" ,guile-2.0))))) + (inputs (list guile-2.0)))) (define-public guile2.2-filesystem (package (inherit guile-filesystem) (name "guile2.2-filesystem") - (inputs `(("guile" ,guile-2.2))))) + (inputs (list guile-2.2)))) (define-public guile-syntax-highlight (package @@ -771,9 +737,9 @@ that augment Guile's support for handling files and their names.") #t)))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (synopsis "General-purpose syntax highlighter for GNU Guile") (description "Guile-syntax-highlight is a general-purpose syntax highlighting library for GNU Guile. It can parse code written in various @@ -799,20 +765,15 @@ HTML (via SXML) or any other format for rendering.") (base32 "18zlg4mkgd3swgv2ggfz91ivnnzc0zhvc9ybgrxg1y762va9hyvj")))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo) - ,@(package-native-inputs guile-syntax-highlight))) + (modify-inputs (package-native-inputs guile-syntax-highlight) + (prepend autoconf automake texinfo))) (properties '((hidden? . #t)))))) (define-public guile2.2-syntax-highlight (package (inherit guile-syntax-highlight) (name "guile2.2-syntax-highlight") - (inputs `(("guile" ,guile-2.2))))) - -(define-public guile3.0-syntax-highlight - (deprecated-package "guile3.0-syntax-highlight" guile-syntax-highlight)) + (inputs (list guile-2.2)))) (define-public guile-sjson (package @@ -835,11 +796,9 @@ HTML (via SXML) or any other format for rendering.") #t)))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) + (list autoconf automake pkg-config)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://gitlab.com/dustyweb/guile-sjson") (synopsis "S-expression based json reader/writer for Guile") (description "guile-sjson is a json reader/writer for Guile. @@ -850,11 +809,11 @@ It has a nice, simple s-expression based syntax.") (package (inherit guile-sjson) (name "guile2.2-sjson") - (inputs `(("guile" ,guile-2.2))))) + (inputs (list guile-2.2)))) (define-public guile-squee - (let ((commit "c1497a216e881cfde39d6aa7c73d0bf6b497c89b") - (revision "2")) + (let ((commit "a151fd006fa819945ca1d4749b173854269b9f70") + (revision "3")) (package (name "guile-squee") (version (string-append "0-" revision "." (string-take commit 7))) @@ -866,7 +825,7 @@ It has a nice, simple s-expression based syntax.") (file-name (git-file-name name version)) (sha256 (base32 - "1alskrplnyl1n5wb39drn72cwplp47a8cpdd1n9cdnw3jhk5p12p")))) + "1jps14z8653ah2kr367iayzyi3ql2s55l77xrafz7gk3mzcvgrrg")))) (build-system guile-build-system) (arguments '(#:phases @@ -877,13 +836,12 @@ It has a nice, simple s-expression based syntax.") (("dynamic-link \"libpq\"") (string-append "dynamic-link \"" - (assoc-ref inputs "postgresql") "/lib/libpq.so" - "\""))) - #t))))) + (search-input-file inputs "/lib/libpq.so") + "\"")))))))) (inputs - `(("postgresql" ,postgresql))) + (list postgresql)) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://notabug.org/cwebber/guile-squee") (synopsis "Connect to PostgreSQL using Guile") (description @@ -895,12 +853,8 @@ using Guile's foreign function interface.") (package (inherit guile-squee) (name "guile2.2-squee") - (native-inputs `(("guile" ,guile-2.2) - ,@(alist-delete "guile" - (package-native-inputs guile-squee)))))) - -(define-public guile3.0-squee - (deprecated-package "guile3.0-squee" guile-squee)) + (native-inputs (modify-inputs (package-native-inputs guile-squee) + (replace "guile" guile-2.2))))) (define-public guile-colorized (package @@ -917,7 +871,7 @@ using Guile's foreign function interface.") (base32 "10mv8c63159r3qvwwdvsgnsvdg7nc2ghak85zapwqpv4ywrqp9zc")))) (build-system guile-build-system) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://gitlab.com/NalaGinrut/guile-colorized") (synopsis "Colorized REPL for Guile") (description @@ -928,10 +882,7 @@ using Guile's foreign function interface.") (package (inherit guile-colorized) (name "guile2.2-colorized") - (native-inputs `(("guile" ,guile-2.2))))) - -(define-public guile3.0-colorized - (deprecated-package "guile3.0-colorized" guile-colorized)) + (native-inputs (list guile-2.2)))) (define-public guile-pfds (package @@ -983,7 +934,7 @@ using Guile's foreign function interface.") "sequences.sls" "sets.sls"))))))) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (synopsis "Purely functional data structures for Guile") (description "This package provides purely functional data structures written in R6RS @@ -1025,12 +976,10 @@ Vicare Scheme and IronScheme. Right now it contains: (("\\/share\\/guile\\/site") "/share/guile/site/2.0")) #t))))) (native-inputs - `(("procps" ,procps) ; fake-cluster-control uses ps - ("guile" ,guile-2.0) - ("postgresql" ,postgresql))) + (list procps ; fake-cluster-control uses ps + guile-2.0 postgresql)) (inputs - `(("guile" ,guile-2.0) - ("postgresql" ,postgresql))) + (list guile-2.0 postgresql)) (home-page "https://www.nongnu.org/guile-pg/") (synopsis "Guile modules for accessing PostgreSQL") (description @@ -1058,12 +1007,9 @@ works with Guile 1.4.x to 2.0.x.") (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("guile" ,guile-3.0))) + (list pkg-config autoconf automake guile-3.0)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://git.cbaines.net/guile/prometheus") (synopsis "Prometheus client library for Guile") (description @@ -1076,7 +1022,7 @@ types are supported.") (package (inherit guile-pfds) (name "guile2.2-pfds") - (native-inputs `(("guile" ,guile-2.2))) + (native-inputs (list guile-2.2)) (arguments (substitute-keyword-arguments (package-arguments guile-pfds) ((#:phases phases) @@ -1094,9 +1040,6 @@ types are supported.") (find-files "." "\\.sls$")) #t)))))))) -(define-public guile3.0-pfds - (deprecated-package "guile3.0-pfds" guile-pfds)) - (define-public guile-aa-tree (package (name "guile-aa-tree") @@ -1109,7 +1052,7 @@ types are supported.") (base32 "0044c105r3q9vpl17pv3phl1b79kjm1llhkakqgiasixyav01blh")))) (build-system guile-build-system) - (native-inputs `(("guile" ,guile-2.2))) + (native-inputs (list guile-2.2)) ;; https://savannah.nongnu.org/projects/guile-aa-tree (home-page "https://qlfiles.net/guile-aa-tree/") (synopsis "AA tree data structure for Guile") @@ -1143,12 +1086,9 @@ convenient nested tree operations.") '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("zeromq" ,zeromq))) + (list autoconf automake pkg-config zeromq)) (home-page "https://github.com/jerry40/guile-simple-zmq") (synopsis "Guile wrapper over ZeroMQ library") (description @@ -1160,10 +1100,7 @@ messaging library.") (package (inherit guile-simple-zmq) (name "guile2.2-simple-zmq") - (native-inputs `(("guile" ,guile-2.2))))) - -(define-public guile3.0-simple-zmq - (deprecated-package "guile3.0-simple-zmq" guile-simple-zmq)) + (native-inputs (list guile-2.2)))) (define-public jupyter-guile-kernel (let ((commit "f25fb90b95529b17a006a807bd04e6aee12ea304") @@ -1190,9 +1127,7 @@ messaging library.") ;; command. (substitute* "src/hmac.scm" (("openssl") - (string-append (assoc-ref inputs "openssl") - "/bin/openssl"))) - #t)) + (search-input-file inputs "/bin/openssl"))))) ;; XXX: The code uses 'include' to include its own source ;; files, and "-L src" isn't enough in this case. @@ -1244,10 +1179,7 @@ messaging library.") ", \"-s")))) #t)))))) (inputs - `(("openssl" ,openssl) - ("guile" ,guile-3.0) - ("guile-json" ,guile-json-3) - ("guile-simple-zmq" ,guile-simple-zmq))) + (list openssl guile-3.0 guile-json-3 guile-simple-zmq)) (synopsis "Guile kernel for the Jupyter Notebook") (description "This package provides a Guile 2.x kernel for the Jupyter Notebook. It @@ -1268,9 +1200,9 @@ allows users to interact with the Guile REPL through Jupyter.") (base32 "1jf4972f9fpm0rd865xpnc9mzl3xv6vhfnp0iygadydy905z9nln")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://github.com/roelj/guile-sparql") (synopsis "SPARQL module for Guile") (description "This package provides the functionality to query a SPARQL @@ -1291,10 +1223,9 @@ using S-expressions.") "1cc63nw3xdfjrfk8c58r6d5lidmfq5cpqcy32yd5xp81yccprvn9")))) (build-system gnu-build-system) (propagated-inputs - `(("guile-email" ,guile-email))) + (list guile-email)) (native-inputs - `(("guile" ,guile-3.0) - ("pkg-config" ,pkg-config))) + (list guile-3.0 pkg-config)) (home-page "https://savannah.gnu.org/projects/guile-debbugs/") (synopsis "Guile interface to the Debbugs bug tracking service") (description @@ -1314,13 +1245,14 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.") version ".tar.lz")) (sha256 (base32 - "1rc8r0fgvflnyq5ckl7ii8sghpsgpkzxa8vskjr1ak2kyar6m35k")))) + "1rc8r0fgvflnyq5ckl7ii8sghpsgpkzxa8vskjr1ak2kyar6m35k")) + (patches + (search-patches "guile-email-fix-tests.patch")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config) - ("lzip" ,lzip))) + (list pkg-config lzip)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings (home-page "https://guile-email.systemreboot.net") @@ -1332,8 +1264,8 @@ format.") (license license:agpl3+))) (define-public guile-email-latest - (let ((commit "ca0520a33c9042a68691d85c6849f88412ca8357") - (revision "1")) + (let ((commit "ea60bb902d3677d5c653851c7aa6afbbf710140e") + (revision "2")) (package (inherit guile-email) (name "guile-email-latest") @@ -1347,22 +1279,16 @@ format.") (file-name (git-file-name name version)) (sha256 (base32 - "1l5mikalawq83786rnb9zky908ncsd5dna9vyz6bx6kc2frrl7xv")))) + "1g4rn7ai3nfxmpppc8qbpv8b18wnsld29y5xa58cv9b8pf3pbwnj")))) (native-inputs - `(("pkg-config" ,pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo)))))) + (list pkg-config autoconf automake texinfo))))) (define-public guile2.2-email (package (inherit guile-email) (name "guile2.2-email") - (inputs `(("guile" ,guile-2.2) - ,@(alist-delete "guile" (package-inputs guile-email)))))) - -(define-public guile3.0-email - (deprecated-package "guile3.0-email" guile-email)) + (inputs (modify-inputs (package-inputs guile-email) + (replace "guile" guile-2.2))))) (define-public guile-newt (package @@ -1382,12 +1308,9 @@ format.") '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings (inputs - `(("guile" ,guile-3.0) - ("newt" ,newt))) + (list guile-3.0 newt)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) + (list autoconf automake pkg-config)) (synopsis "Guile bindings to Newt") (description "This package provides bindings for Newt, a programming library for @@ -1400,11 +1323,8 @@ Scheme by using Guile’s foreign function interface.") (package (inherit guile-newt) (name "guile2.2-newt") - (inputs `(("guile" ,guile-2.2) - ,@(alist-delete "guile" (package-inputs guile-newt)))))) - -(define-public guile3.0-newt - (deprecated-package "guile3.0-newt" guile-newt)) + (inputs (modify-inputs (package-inputs guile-newt) + (replace "guile" guile-2.2))))) (define-public guile-mastodon (let ((commit "74b75bcf547df92acee1e0466ecd7ec07f775392") @@ -1423,15 +1343,9 @@ Scheme by using Guile’s foreign function interface.") "1wx5h6wa9c0na8mrnr2nv1nzjvq68zyrly8yyp11dsskhaw4y33h")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("emacs" ,emacs-minimal) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + (list autoconf automake emacs-minimal pkg-config texinfo)) (inputs - `(("guile" ,guile-3.0) - ("gnutls" ,gnutls) - ("guile-json" ,guile-json-4))) + (list guile-3.0 gnutls guile-json-4)) (home-page "https://framagit.org/prouby/guile-mastodon") (synopsis "Guile Mastodon REST API module") (description "This package provides Guile modules to access the @@ -1458,14 +1372,11 @@ microblogging service.") '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings (inputs - `(("guile" ,guile-3.0) - ("parted" ,parted))) + (list guile-3.0 parted)) (propagated-inputs - `(("guile-bytestructures" ,guile-bytestructures))) + (list guile-bytestructures)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) + (list autoconf automake pkg-config)) (synopsis "Guile bindings to GNU Parted") (description "This package provides bindings for GNU Parted library, a C library @@ -1478,18 +1389,15 @@ written in pure Scheme by using Guile's foreign function interface.") (package (inherit guile-parted) (name "guile2.2-parted") - (inputs `(("guile" ,guile-2.2) - ,@(alist-delete "guile" (package-inputs guile-parted)))) + (inputs (modify-inputs (package-inputs guile-parted) + (replace "guile" guile-2.2))) (propagated-inputs `(("guile-bytestructures" ,guile2.2-bytestructures))))) -(define-public guile3.0-parted - (deprecated-package "guile3.0-parted" guile-parted)) - (define-public guile-xosd (package (name "guile-xosd") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (string-append "https://github.com/alezost/" name @@ -1497,16 +1405,22 @@ written in pure Scheme by using Guile's foreign function interface.") "/" name "-" version ".tar.gz")) (sha256 (base32 - "1ri5065c16kmgrf2pysn2ymxjqi5302lhpb07wkl1jr75ym8fn8p")))) + "10r29bpyrsvjalnzkam2falj9k34lvxmch05zs606zp1nk93whp3")))) (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'set-cpath + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CPATH" + (string-append + (assoc-ref inputs "guile") "/include/guile/3.0:" + (or (getenv "CPATH") ""))) + #t))))) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("guile" ,guile-2.2) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxinerama" ,libxinerama) - ("xosd" ,xosd))) + (list guile-3.0 libx11 libxext libxinerama xosd)) (home-page "https://github.com/alezost/guile-xosd") (synopsis "XOSD bindings for Guile") (description @@ -1518,143 +1432,147 @@ library}.") (define-public guile-dbi (package (name "guile-dbi") - (version "2.1.6") + (version "2.1.8") (source (origin (method git-fetch) (uri (git-reference - (url "https://example.org") ;only hosted on Software Heritage - (commit "e19b019e9683faf66c3f385b20fcc112e65f8c6e"))) + (url "https://github.com/opencog/guile-dbi") + (commit (string-append "guile-dbi-" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "09ys5hj7gnj5w1iv1m194j06jk6b8sdhc8j6hcv3bprq1428kyxw")))) + "123m4j82bi60s1v95pjh4djb7bh6zdwmljbpyg7zq8ni2gyal7lw")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - (list (string-append - "--with-guile-site-dir=" %output "/share/guile/site/2.2")) - #:make-flags + `(#:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:configure-flags (list (string-append - "LDFLAGS=-Wl,-rpath=" %output "/lib:" - (assoc-ref %build-inputs "guile-dbd-sqlite3") "/lib" ":" - (assoc-ref %build-inputs "guile-dbd-postgresql") "/lib")) + "--with-guile-site-dir=" %output "/share/guile/site/" + (target-guile-effective-version (assoc-ref %build-inputs "guile")))) #:phases (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + ;; The upstream Git repository contains all the code, so change + ;; to the directory specific to guile-dbi. + (chdir "guile-dbi"))) (add-after 'install 'patch-extension-path - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (dbi.scm (string-append - out "/share/guile/site/2.2/dbi/dbi.scm")) - (ext (string-append out "/lib/libguile-dbi"))) - (substitute* dbi.scm (("libguile-dbi") ext)) - #t)))))) - (inputs - `(("guile-dbd-sqlite3" ,guile-dbd-sqlite3) - ("guile-dbd-postgresql" ,guile-dbd-postgresql))) ; only shared library, no scheme files + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (dbi.scm (string-append out "/share/guile/site/" + (target-guile-effective-version + (assoc-ref inputs "guile")) + "/dbi/dbi.scm")) + (ext (string-append out "/lib/libguile-dbi"))) + (substitute* dbi.scm (("libguile-dbi") ext)))))))) + (native-inputs + (list autoconf automake libtool perl texinfo)) (propagated-inputs - `(("guile" ,guile-2.2))) + (list guile-2.2)) (synopsis "Guile database abstraction layer") - (home-page "https://web.archive.org/web/20160328232717/http://home.gna.org/guile-dbi/guile-dbi.html") + (home-page "https://github.com/opencog/guile-dbi") (description "guile-dbi is a library for Guile that provides a convenient interface to SQL databases. Database programming with guile-dbi is generic in that the same programming interface is presented regardless of which database system is used. It currently supports MySQL, Postgres and SQLite3.") - (license license:gpl2+))) + (license license:gpl2+) + (native-search-paths + (list (search-path-specification + (variable "GUILE_DBD_PATH") + (files '("lib"))))))) -(define guile-dbi-bootstrap +(define-public guile-dbd-sqlite3 (package (inherit guile-dbi) - (name "guile-dbi-bootstrap") - (inputs '()) + (name "guile-dbd-sqlite3") (arguments (substitute-keyword-arguments (package-arguments guile-dbi) - ((#:make-flags _) '(list)))))) - -(define-public guile-dbd-sqlite3 - (package - (name "guile-dbd-sqlite3") - (version "2.1.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://example.org") ;only hosted on Software Heritage - (commit "0758c615e9e85ad76d153d5dc6179881f1f50089"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1rwf3z6ib6nkhfnk2nw8p6fqirdx2pparcrlmsm0i2ii62plpqhb")))) - (build-system gnu-build-system) - (native-inputs - `(("pkg-config" ,pkg-config) - ("guile-dbi-bootstrap" ,guile-dbi-bootstrap))) ; only required for headers + ((#:phases phases) + `(modify-phases ,phases + (replace 'chdir + (lambda _ + ;; The upstream Git repository contains all the code, so change + ;; to the directory specific to guile-dbd-sqlite3. + (chdir "guile-dbd-sqlite3"))) + (delete 'patch-extension-path))))) (inputs - `(("sqlite" ,sqlite) - ("zlib" ,(@ (gnu packages compression) zlib)))) + (list sqlite zlib)) + (native-inputs + (modify-inputs (package-native-inputs guile-dbi) + (prepend guile-dbi ; only required for headers + pkg-config))) (synopsis "Guile DBI driver for SQLite") - ;; Unofficial home-page. - ;; Added by b9cbfa52f71505de8447fefabd97f16d0a9cbde6 (2016-06) - (home-page "https://github.com/jkalbhenn/guile-dbd-sqlite3") (description "guile-dbi is a library for Guile that provides a convenient interface to -SQL databases. This package implements the interface for SQLite.") - (license license:gpl2+))) +SQL databases. This package implements the interface for SQLite."))) (define-public guile-dbd-postgresql - (let ((commit "e97589b6b018b206c901e4cc24db463407a4036b") - (revision 0)) - (package - (name "guile-dbd-postgresql") - (version (string-append - "2.1.6-" (number->string revision) "." (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/opencog/guile-dbi") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0n1gv9a0kdys10a4qmnrwvg5sydwb03880asri4gqdchcj3fimni")))) - (build-system gnu-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir + (package + (inherit guile-dbi) + (name "guile-dbd-postgresql") + (arguments + (substitute-keyword-arguments (package-arguments guile-dbi) + ((#:phases phases) + `(modify-phases ,phases + (replace 'chdir (lambda _ ;; The upstream Git repository contains all the code, so change - ;; to the relevant directory. - (chdir "guile-dbd-postgresql") - #t)) - (add-after 'chdir 'patch-src/Makefile.am - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/Makefile.am" - (("/usr/include") - (string-append (assoc-ref inputs "postgresql") "/include"))) - #t)) - (add-after 'patch-src/Makefile.am 'patch-src + ;; to the directory specific to guile-dbd-mysql. + (chdir "guile-dbd-postgresql"))) + (add-after 'chdir 'patch-src (lambda _ (substitute* "src/guile-dbd-postgresql.c" - (("postgresql/libpq-fe\\.h") "libpq-fe.h")) - #t))))) - (native-inputs - `(("pkg-config" ,pkg-config) - ("automake" ,automake) - ("autoconf" ,autoconf) - ("perl" ,perl) - ("libtool" ,libtool) - ("guile-dbi-bootstrap" ,guile-dbi-bootstrap))) - (inputs - `(("postgresql" ,postgresql) - ("zlib" ,zlib))) - (synopsis "Guile DBI driver for PostgreSQL") - (home-page - "https://github.com/opencog/guile-dbi/tree/master/guile-dbd-postgresql") - (description - "@code{guile-dbi} is a library for Guile that provides a convenient + (("postgresql/libpq-fe\\.h") "libpq-fe.h")))) + (delete 'patch-extension-path))))) + (inputs + (list postgresql zlib)) + (native-inputs + (modify-inputs (package-native-inputs guile-dbi) + (prepend guile-dbi ; only required for headers + ))) + (synopsis "Guile DBI driver for PostgreSQL") + (description + "@code{guile-dbi} is a library for Guile that provides a convenient interface to SQL databases. This package implements the interface for -PostgreSQL.") - (license license:gpl2+)))) +PostgreSQL."))) + +(define-public guile-dbd-mysql + (package + (inherit guile-dbi) + (name "guile-dbd-mysql") + (arguments + (substitute-keyword-arguments (package-arguments guile-dbi) + ((#:phases phases) + `(modify-phases ,phases + (replace 'chdir + (lambda _ + ;; The upstream Git repository contains all the code, so change + ;; to the directory specific to guile-dbd-mysql. + (chdir "guile-dbd-mysql"))) + (add-after 'chdir 'patch-src + (lambda _ + (substitute* "configure.ac" + (("mariadbclient") "mariadb")) + (substitute* "src/guile-dbd-mysql.c" + (("<mariadb/") "<mysql/")))) + (delete 'patch-extension-path))))) + (inputs + (list `(,mariadb "dev") + `(,mariadb "lib") zlib)) + (native-inputs + (modify-inputs (package-native-inputs guile-dbi) + (prepend guile-dbi ; only required for headers + ))) + (synopsis "Guile DBI driver for MySQL") + (description "@code{guile-dbi} is a library for Guile that provides a +convenient interface to SQL databases. This package implements the interface +for MySQL.") + (license license:gpl2+))) (define-public guile-config (package @@ -1671,11 +1589,8 @@ PostgreSQL.") "09028ylbddjdp3d67zdjz3pnsjqz6zs2bfck5rr3dfaa0qjap40n")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-3.0))) + (list autoconf automake pkg-config texinfo)) + (inputs (list guile-3.0)) (synopsis "Guile application configuration parsing library.") (description @@ -1694,11 +1609,8 @@ above command-line parameters.") (package (inherit guile-config) (name "guile2.2-config") - (inputs `(("guile" ,guile-2.2) - ,@(alist-delete "guile" (package-inputs guile-config)))))) - -(define-public guile3.0-config - (deprecated-package "guile3.0-config" guile-config)) + (inputs (modify-inputs (package-inputs guile-config) + (replace "guile" guile-2.2))))) (define-public guile-hall (package @@ -1762,13 +1674,10 @@ above command-line parameters.") ,''("hall")) #t)))))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-3.0))) + (list autoconf automake pkg-config texinfo)) + (inputs (list guile-3.0)) (propagated-inputs - `(("guile-config" ,guile-config))) + (list guile-config)) (synopsis "Guile project tooling") (description "Hall is a command-line application and a set of Guile libraries that @@ -1782,16 +1691,13 @@ provides tight coupling to Guix.") (package (inherit guile-hall) (name "guile2.2-hall") - (inputs `(("guile" ,guile-2.2) - ,@(alist-delete "guile" (package-inputs guile-hall)))) + (inputs (modify-inputs (package-inputs guile-hall) + (replace "guile" guile-2.2))) (propagated-inputs `(("guile-config" ,guile2.2-config) ,@(alist-delete "guile-config" (package-propagated-inputs guile-hall)))))) -(define-public guile3.0-hall - (deprecated-package "guile3.0-hall" guile-hall)) - (define-public guile-ics (package (name "guile-ics") @@ -1814,6 +1720,9 @@ provides tight coupling to Guix.") "GUILE_PKG([3.0 2.2 2.0])\n")) #t)))) (build-system gnu-build-system) + ;; XXX: Tests expect 'test-runner-current' to not return #f after + ;; 'test-end', which is no longer the case in Guile 3.0.7. + (arguments '(#:tests? #f)) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -1821,8 +1730,8 @@ provides tight coupling to Guix.") ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'. ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) - (inputs `(("guile" ,guile-3.0) ("which" ,which))) - (propagated-inputs `(("guile-lib" ,guile-lib))) + (inputs (list guile-3.0 which)) + (propagated-inputs (list guile-lib)) (home-page "https://github.com/artyom-poptsov/guile-ics") (synopsis "Guile parser library for the iCalendar format") (description @@ -1836,13 +1745,10 @@ The library is shipped with documentation in Info format and usage examples.") (package (inherit guile-ics) (name "guile2.2-ics") - (inputs `(("guile" ,guile-2.2) - ,@(alist-delete "guile" (package-inputs guile-ics)))) + (inputs (modify-inputs (package-inputs guile-ics) + (replace "guile" guile-2.2))) (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) -(define-public guile3.0-ics - (deprecated-package "guile3.0-ics" guile-ics)) - (define-public guile-imanifest (let ((commit "ccd5a2111b008d778106f5595a3a585954d95d0") (revision "0")) @@ -1860,11 +1766,9 @@ The library is shipped with documentation in Info format and usage examples.") "0i5qllcrhdjhspyj7j9h4dc9y37d3cfbpackmybm3030qgfxqirf")))) (build-system guile-build-system) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (propagated-inputs - `(("guile-readline" ,guile-readline) - ("guile-colorized" ,guile-colorized) - ("guix" ,guix))) + (list guile-readline guile-colorized guix)) (home-page "https://sr.ht/~brown121407/guile-imanifest") (synopsis "Interactive Guix manifests") (description "This package provides functions to generate Guix manifests @@ -1875,7 +1779,7 @@ user which package sets would they like to install from it.") (define-public guile-wisp (package (name "guile-wisp") - (version "1.0.5") + (version "1.0.6") (source (origin (method hg-fetch) (uri (hg-reference @@ -1884,7 +1788,7 @@ user which package sets would they like to install from it.") (file-name (git-file-name name version)) (sha256 (base32 - "00iknn03gf421gg3061g35fbraqrkcqypkrfn10rhlgg6j0lgk67")))) + "0df0vch2p6qymz3f96clrkl2gphjk6x7fbya236yzxc07hkz2j3g")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -1900,13 +1804,11 @@ user which package sets would they like to install from it.") (modify-phases %standard-phases (replace 'bootstrap (lambda _ - (invoke "autoreconf" "-vif") - #t)) + (invoke "autoreconf" "-vif"))) (add-before 'configure 'patch-/usr/bin/env (lambda _ (substitute* "Makefile.in" - (("/usr/bin/env bash") (which "bash"))) - #t)) + (("/usr/bin/env bash") (which "bash"))))) ;; auto compilation breaks, but if we set HOME to /tmp, ;; that works ok (add-before 'check 'auto-compile-hacky-workaround @@ -1930,8 +1832,7 @@ user which package sets would they like to install from it.") (go (string-append object-dir base ".go"))) (invoke "guild" "compile" "-L" module-dir file "-o" go))) - (find-files module-dir "\\.scm$")) - #t))) + (find-files module-dir "\\.scm$"))))) (add-after 'install 'install-emacs-files (assoc-ref emacs:%standard-phases 'install)) (add-after 'install-emacs-files 'compile-emacs-files @@ -1940,7 +1841,7 @@ user which package sets would they like to install from it.") (assoc-ref emacs:%standard-phases 'make-autoloads))))) (home-page "https://www.draketo.de/english/wisp") (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -1958,15 +1859,12 @@ users and in some situations.") (package (inherit guile-wisp) (name "guile2.2-wisp") - (inputs `(("guile" ,guile-2.2))))) - -(define-public guile3.0-wisp - (deprecated-package "guile3.0-wisp" guile-wisp)) + (inputs (list guile-2.2)))) (define-public guile-udev (package (name "guile-udev") - (version "0.1.0") + (version "0.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -1975,19 +1873,18 @@ users and in some situations.") (file-name (git-file-name name version)) (sha256 (base32 - "1l6csncjqnx58c6c3wdl7rshnhk4pzhjq2q8lnkg483564s9w5py")))) + "0xvh4wscxmiqm8lnmfyh5cjzn89kv2wslkfvqvcjhinzpnpbg91x")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gettext" ,gettext-minimal) - ("libtool" ,libtool) - ("texinfo" ,texinfo) - ("pkg-config" ,pkg-config) - ("which" ,which))) + (list autoconf + automake + gettext-minimal + libtool + texinfo + pkg-config + which)) (inputs - `(("guile" ,guile-3.0) - ("eudev" ,eudev))) + (list guile-3.0 eudev)) (home-page "https://github.com/artyom-poptsov/guile-udev") (synopsis "Guile bindings to libudev") (description @@ -2031,15 +1928,11 @@ users and in some situations.") (string-append "--with-libgslcblas-prefix=" (assoc-ref %build-inputs "gsl"))))) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (propagated-inputs - `(("guile-sdl" ,guile-sdl) - ("guile-opengl" ,guile-opengl))) + (list guile-sdl guile-opengl)) (inputs - `(("guile" ,guile-2.2) - ("gsl" ,gsl) - ("freeimage" ,freeimage) - ("mesa" ,mesa))) + (list guile-2.2 gsl freeimage mesa)) (synopsis "2D/3D game engine for GNU Guile") (description "Sly is a 2D/3D game engine written in Guile Scheme. Sly features a functional reactive programming interface and live coding @@ -2078,7 +1971,7 @@ capabilities.") ("gtk" ,gtk+) ("glib" ,glib))) (propagated-inputs - `(("gobject-introspection" ,gobject-introspection))) + (list gobject-introspection)) (arguments `(#:phases (modify-phases %standard-phases @@ -2147,12 +2040,11 @@ object-oriented programming system, GOOPS.") "0ak0bha37dfpj9kmyw1r8fj8nva639aw5xr66wr5gd3l1rqf5xhg")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (propagated-inputs - `(("guile" ,guile-2.2) - ("guile-lib" ,guile-lib))) + (list guile-2.2 guile-lib)) (inputs - `(("libffi" ,libffi))) + (list libffi)) (arguments `(#:configure-flags '("--disable-Werror") #:phases @@ -2190,7 +2082,7 @@ provides access to that interface and its types from the Scheme level.") "09q51zkw2fypad5xixskfzw2cjhjgs5cswdp3i7cpp651rb3zndh")))) (build-system guile-build-system) (native-inputs - `(("guile" ,guile-2.2))) + (list guile-2.2)) (home-page "https://github.com/fisherdj/miniAdapton") (synopsis "Minimal implementation of incremental computation in Guile Scheme") @@ -2227,12 +2119,12 @@ understand, extend, and port to host languages other than Scheme.") (when tests? (invoke "guile" "-L" "." "-s" "test.scm"))))))) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://github.com/lloda/guile-raw-strings") (synopsis "Guile reader extension for `raw strings'") (description "This package provides A Guile reader extension for `raw strings', it lets you write verbatim strings without having to escape double -quotes. ") +quotes.") (license license:public-domain)))) (define-public guile-reader @@ -2247,9 +2139,8 @@ quotes. ") (base32 "1fyjckmygkhq22lq8nqc86yl5zzbqd7a944dnz5c1f6vx92b9hiq")))) (build-system gnu-build-system) - (native-inputs `(("pkgconfig" ,pkg-config) - ("gperf" ,gperf))) - (inputs `(("guile" ,guile-3.0))) + (native-inputs (list pkg-config gperf)) + (inputs (list guile-3.0)) (synopsis "Framework for building readers for GNU Guile") (description "Guile-Reader is a simple framework for building readers for GNU Guile. @@ -2270,7 +2161,7 @@ many readers as needed).") (package (inherit guile-reader) (name "guile2.2-reader") - (inputs `(("guile" ,guile-2.2))))) + (inputs (list guile-2.2)))) (define-public guile-ncurses (package @@ -2284,9 +2175,8 @@ many readers as needed).") (base32 "038xbffalhymg26lvmzgf7ljilxz2f2zmqg5r5nfzbipfbprwjhf")))) (build-system gnu-build-system) - (inputs `(("ncurses" ,ncurses) - ("guile" ,guile-3.0))) - (native-inputs `(("pkg-config" ,pkg-config))) + (inputs (list ncurses guile-3.0)) + (native-inputs (list pkg-config)) (arguments `(#:modules ((guix build gnu-build-system) ((guix build guile-build-system) @@ -2323,11 +2213,7 @@ library.") (package (inherit guile-ncurses) (name "guile2.2-ncurses") - (inputs `(("ncurses" ,ncurses) - ("guile" ,guile-2.2))))) - -(define-public guile3.0-ncurses - (deprecated-package "guile3.0-ncurses" guile-ncurses)) + (inputs (list ncurses guile-2.2)))) (define-public guile-ncurses/gpm (package @@ -2336,13 +2222,6 @@ library.") (inputs `(("ncurses" ,ncurses/gpm) ("guile" ,guile-3.0))))) -(define-public guile3.0-ncurses/gpm - (package - (inherit guile3.0-ncurses) - (name "guile3.0-ncurses-with-gpm") - (inputs `(("ncurses" ,ncurses/gpm) - ("guile" ,guile-3.0))))) - (define-public guile-lib (package (name "guile-lib") @@ -2374,7 +2253,7 @@ $(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n"))))))) ("guile" ,guile-3.0) ("pkg-config" ,pkg-config))) (inputs - `(("guile" ,guile-3.0))) ;for cross-compilation + (list guile-3.0)) ;for cross-compilation (home-page "https://www.nongnu.org/guile-lib/") (synopsis "Collection of useful Guile Scheme modules") (description @@ -2438,9 +2317,6 @@ for Guile\". It provides the following modules: (alist-replace "guile" (list guile-2.2) (package-inputs guile-lib))))) -(define-public guile3.0-lib - (deprecated-package "guile3.0-lib" guile-lib)) - (define-public guile-minikanren (package (name "guile-minikanren") @@ -2456,7 +2332,7 @@ for Guile\". It provides the following modules: "0r50jlpzi940jlmxyy3ddqqwmj5r12gb4bcv0ssini9v8km13xz6")))) (build-system guile-build-system) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://github.com/ijp/minikanren") (synopsis "MiniKanren declarative logic system, packaged for Guile") (description @@ -2475,16 +2351,13 @@ See http://minikanren.org/ for more on miniKanren generally.") (package (inherit guile-minikanren) (name "guile2.0-minikanren") - (native-inputs `(("guile" ,guile-2.0))))) + (native-inputs (list guile-2.0)))) (define-public guile2.2-minikanren (package (inherit guile-minikanren) (name "guile2.2-minikanren") - (native-inputs `(("guile" ,guile-2.2))))) - -(define-public guile3.0-minikanren - (deprecated-package "guile3.0-minikanren" guile-minikanren)) + (native-inputs (list guile-2.2)))) (define-public guile-irregex (package @@ -2517,7 +2390,7 @@ See http://minikanren.org/ for more on miniKanren generally.") #t))) #:source-directory "src")) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "http://synthcode.com/scheme/irregex") (synopsis "S-expression based regular expressions") (description @@ -2530,16 +2403,13 @@ inspired by the SCSH regular expression system.") (package (inherit guile-irregex) (name "guile2.0-irregex") - (native-inputs `(("guile" ,guile-2.0))))) + (native-inputs (list guile-2.0)))) (define-public guile2.2-irregex (package (inherit guile-irregex) (name "guile2.2-irregex") - (native-inputs `(("guile" ,guile-2.2))))) - -(define-public guile3.0-irregex - (deprecated-package "guile3.0-irregex" guile-irregex)) + (native-inputs (list guile-2.2)))) (define-public haunt (package @@ -2594,15 +2464,13 @@ inspired by the SCSH regular expression system.") deps)))) #t))))))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + (list pkg-config texinfo)) (inputs ;; Depend on the latest Guile to avoid bytecode compatibility issues when ;; using modules built against the latest version. - `(("guile" ,guile-3.0-latest))) + (list guile-3.0-latest)) (propagated-inputs - `(("guile-reader" ,guile-reader) - ("guile-commonmark" ,guile-commonmark))) + (list guile-reader guile-commonmark)) (synopsis "Functional static site generator") (description "Haunt is a static site generator written in Guile Scheme. Haunt features a functional build system and an extensible @@ -2614,7 +2482,7 @@ interface for reading articles in any format.") (package (inherit haunt) (name "guile2.2-haunt") - (inputs `(("guile" ,guile-2.2))) + (inputs (list guile-2.2)) (propagated-inputs `(("guile-reader" ,guile2.2-reader) ("guile-commonmark" ,guile2.2-commonmark))))) @@ -2623,10 +2491,7 @@ interface for reading articles in any format.") (package (inherit haunt) (name "guile2.0-haunt") - (inputs `(("guile" ,guile-2.0))))) - -(define-public guile3.0-haunt - (deprecated-package "guile3.0-haunt" haunt)) + (inputs (list guile-2.0)))) (define-public guile-redis (package @@ -2646,10 +2511,7 @@ interface for reading articles in any format.") (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("guile" ,guile-3.0))) + (list autoconf automake pkg-config guile-3.0)) (synopsis "Redis client library for Guile") (description "Guile-redis provides a Scheme interface to the Redis key-value cache and store.") @@ -2659,9 +2521,8 @@ key-value cache and store.") (package (inherit guile-redis) (name "guile2.2-redis") - (native-inputs `(("guile" ,guile-2.2) - ,@(alist-delete "guile" - (package-native-inputs guile-redis)))))) + (native-inputs (modify-inputs (package-native-inputs guile-redis) + (replace "guile" guile-2.2))))) (define-public guile2.0-redis (package @@ -2679,9 +2540,8 @@ key-value cache and store.") "(rnrs io ports)")) #t))) ,@(package-arguments guile-redis))) - (native-inputs `(("guile" ,guile-2.0) - ,@(alist-delete "guile" - (package-native-inputs guile-redis)))))) + (native-inputs (modify-inputs (package-native-inputs guile-redis) + (replace "guile" guile-2.0))))) (define-public guile-commonmark (package @@ -2718,9 +2578,9 @@ key-value cache and store.") (("\\(exit.*") "")) #t))))) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (synopsis "CommonMark parser for Guile") (description "guile-commonmark is a library for parsing CommonMark, a fully specified @@ -2735,16 +2595,13 @@ is no support for parsing block and inline level HTML.") (package (inherit guile-commonmark) (name "guile2.2-commonmark") - (inputs `(("guile" ,guile-2.2))))) + (inputs (list guile-2.2)))) (define-public guile2.0-commonmark (package (inherit guile-commonmark) (name "guile2.0-commonmark") - (inputs `(("guile" ,guile-2.0))))) - -(define-public guile3.0-commonmark - (deprecated-package "guile3.0-commonmark" guile-commonmark)) + (inputs (list guile-2.0)))) (define-public mcron (package @@ -2780,7 +2637,7 @@ is no support for parsing block and inline level HTML.") ("tzdata" ,tzdata-for-tests) ("guile-native" ;for 'guild compile' ,@(assoc-ref (package-inputs this-package) "guile")))) - (inputs `(("guile" ,guile-3.0))) + (inputs (list guile-3.0)) (home-page "https://www.gnu.org/software/mcron/") (synopsis "Run jobs at scheduled times") (description @@ -2794,10 +2651,7 @@ format is also supported.") (package (inherit mcron) (name "guile2.2-mcron") - (inputs `(("guile" ,guile-2.2))))) - -(define-public guile3.0-mcron - (deprecated-package "guile3.0-mcron" mcron)) + (inputs (list guile-2.2)))) (define-public guile-picture-language (let ((commit "a1322bf11945465241ca5b742a70893f24156d12") @@ -2816,16 +2670,11 @@ format is also supported.") "03i528z92ainccgm28shg4haxiav5x4cyhyi5dggq1rm027vbm99")))) (build-system gnu-build-system) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (propagated-inputs - `(("guile-cairo" ,guile-cairo) - ("guile-rsvg" ,guile-rsvg))) + (list guile-cairo guile-rsvg)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("librsvg" ,librsvg) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + (list autoconf automake librsvg pkg-config texinfo)) (home-page "https://git.elephly.net/software/guile-picture-language.git") (synopsis "Picture language for Guile") (description @@ -2839,14 +2688,9 @@ The picture values can directly be displayed in Geiser.") (package (inherit guile-picture-language) (name "guile2.2-picture-language") - (inputs `(("guile" ,guile-2.2))) + (inputs (list guile-2.2)) (propagated-inputs - `(("guile-cairo" ,guile2.2-cairo) - ("guile-rsvg" ,guile2.2-rsvg))))) - -(define-public guile3.0-picture-language - (deprecated-package "guile3.0-picture-language" - guile-picture-language)) + (list guile2.2-cairo guile2.2-rsvg)))) (define-public guile-studio (let ((commit "dd0ad42e51feafebda7cc29afe7c8bc7a182a842") @@ -2890,25 +2734,25 @@ The picture values can directly be displayed in Geiser.") (delete 'configure) (delete 'install)))) (inputs - `(("guile" ,guile-3.0) - ("guile-picture-language" ,guile-picture-language) - ("emacs" ,emacs) - ("emacs-f" ,emacs-f) ; needed by doom-modeline - ("emacs-memoize" ,emacs-memoize) ; needed by all-the-icons - ("emacs-all-the-icons" ,emacs-all-the-icons) ; needed by doom-modeline - ("emacs-all-the-icons-dired" ,emacs-all-the-icons-dired) - ("emacs-dired-sidebar" ,emacs-dired-sidebar) - ("emacs-doom-modeline" ,emacs-doom-modeline) - ("emacs-modus-themes" ,emacs-modus-themes) - ("emacs-geiser" ,emacs-geiser) - ("emacs-geiser-guile" ,emacs-geiser-guile) - ("emacs-company" ,emacs-company) - ("emacs-ivy" ,emacs-ivy) - ("emacs-flycheck" ,emacs-flycheck) - ("emacs-flycheck-guile" ,emacs-flycheck-guile) - ("emacs-paren-face" ,emacs-paren-face))) + (list guile-3.0 + guile-picture-language + emacs + emacs-f ; needed by doom-modeline + emacs-memoize ; needed by all-the-icons + emacs-all-the-icons ; needed by doom-modeline + emacs-all-the-icons-dired + emacs-dired-sidebar + emacs-doom-modeline + emacs-modus-themes + emacs-geiser + emacs-geiser-guile + emacs-company + emacs-ivy + emacs-flycheck + emacs-flycheck-guile + emacs-paren-face)) (native-inputs - `(("texinfo" ,texinfo))) + (list texinfo)) (home-page "https://gnu.org/software/guile") (synopsis "IDE for Guile") (description @@ -2943,11 +2787,9 @@ completion, a simple mode line, etc.") (delete-file "parser/stis-parser/lang/.#calc.scm") #t))))) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) + (list autoconf automake pkg-config)) (home-page "https://gitlab.com/tampe/stis-parser") (synopsis "Parser combinator framework") (description @@ -2980,7 +2822,7 @@ chunks can be expressions as well as simple tokens.") (("/usr/local/lib/guile") (string-append (assoc-ref outputs "out") "/lib/guile")) (("/usr/local/include/guile") - (string-append (assoc-ref inputs "guile") "/include/guile")) + (search-input-directory inputs "/include/guile")) (("-L/usr/local/lib") (string-append "-L" (assoc-ref inputs "guile") "/lib"))) #t)) @@ -2992,12 +2834,9 @@ chunks can be expressions as well as simple tokens.") (format #f "\"~a/lib/guile/3.0/extensions/libguile-persist\"" out))) #t)))))) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config))) + (list autoconf automake libtool pkg-config)) (home-page "https://gitlab.com/tampe/guile-persist") (synopsis "Persistence programming framework for Guile") (description @@ -3061,15 +2900,9 @@ serializing continuations or delimited continuations.") (,compiled-path))) #t)))))) (inputs - `(("guile" ,guile-3.0) - ("guile-persist" ,guile-persist) - ("guile-readline" ,guile-readline) - ("guile-stis-parser" ,guile-stis-parser))) + (list guile-3.0 guile-persist guile-readline guile-stis-parser)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config))) + (list autoconf automake libtool pkg-config)) (synopsis "Python implementation in Guile") (description "This package allows you to compile a Guile Python file to any target @@ -3099,9 +2932,9 @@ from @code{tree-il}.") "guilemoddir = $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n")) #t))))) (inputs - `(("guile" ,guile-2.2))) + (list guile-2.2)) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (home-page "https://gitlab.com/brandoninvergo/guile-file-names") (synopsis "Manipulate file names") (description @@ -3116,14 +2949,14 @@ list of components. This module takes care of that for you.") (define-public guile-gi (package (name "guile-gi") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri (string-append "http://lonelycactus.com/tarball/guile_gi-" version ".tar.gz")) (sha256 (base32 - "1ljcfyar1nb6h4jskxnnzrcxcsblawc50qqfdn8cax3zqfskmvzj")))) + "019mbhgyga57k2074kg97mh3qsa8ny9l0kjgqids8cg3c6vbjdby")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags '("--with-gnu-filesystem-hierarchy") @@ -3131,8 +2964,19 @@ list of components. This module takes care of that for you.") (guix build utils) (ice-9 popen) (ice-9 rdelim)) + #:disallowed-references ,(list gtk+ webkitgtk) #:phases (modify-phases %standard-phases + (add-after 'unpack 'remove-dotted-circle-from-combining-character + ;; The test/string.scm files contain ◌̀, which is a dotted circle + ;; (U+25cc) followed by an upper combining character (U+0300). The + ;; old guile 3.0.2 reader incorrectly ignores the dotted circle, + ;; and parses it as the combining character alone, but the new + ;; guile reader does not. + ;; See https://github.com/spk121/guile-gi/issues/112 + (lambda* _ + (substitute* "test/string.scm" + (("#\\\\◌̀") "#\\x0300")))) (add-after 'unpack 'patch-references-to-extension (lambda* (#:key outputs #:allow-other-keys) (let ((effective (read-line @@ -3160,19 +3004,13 @@ list of components. This module takes care of that for you.") (setenv "DISPLAY" ":1") #t))))) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") ; for glib-compile-resources - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server))) - (propagated-inputs - `(("glib" ,glib) - ("gobject-introspection" ,gobject-introspection) - ("gssettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtk+" ,gtk+) - ("guile-lib" ,guile-lib) - ("webkitgtk" ,webkitgtk))) - (inputs `(("guile" ,guile-3.0))) + (list gettext-minimal + `(,glib "bin") ; for glib-compile-resources + libtool pkg-config xorg-server)) + (propagated-inputs (list gobject-introspection)) + (inputs (list guile-3.0 glib + ;; For tests, only relevant when compiling natively + gtk+ webkitgtk)) (home-page "https://github.com/spk121/guile-gi") (synopsis "GObject bindings for Guile") (description @@ -3186,11 +3024,8 @@ pre-alpha code.") (inherit guile-gi) (name "guile2.2-gi") (inputs - `(("guile" ,guile-2.2) - ,@(alist-delete "guile" (package-inputs guile-gi)))))) - -(define-public guile3.0-gi - (deprecated-package "guile3.0-gi" guile-gi)) + (modify-inputs (package-inputs guile-gi) + (replace "guile" guile-2.2))))) (define-public guile-srfi-89 (package @@ -3208,7 +3043,7 @@ pre-alpha code.") (file-name (git-file-name name version)))) (build-system guile-build-system) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://gitlab.com/mjbecze/guile-srfi-89") (synopsis "Hygienic implementation of SRFI-89 for Guile") (description @@ -3232,7 +3067,7 @@ parameters, which define* and lambda* special forms") (file-name (git-file-name name version)))) (build-system guile-build-system) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://gitlab.com/mjbecze/guile-srfi-145") (synopsis "SRFI-145 port for Guile") (description @@ -3256,11 +3091,9 @@ denote the invalidity of certain code paths in a Scheme program.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) + (list autoconf automake pkg-config)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://gitlab.com/samplet/guile-srfi-158") (synopsis "SRFI 158 (Generators and Accumulators) for Guile") (description "This package provides an implementation of SRFI 158 @@ -3291,7 +3124,7 @@ implementation in a thin Guile compatibility layer.") ;; should not be compiled separately, but they must be installed. '(#:not-compiled-file-regexp "-impl\\.scm$")) (inputs - `(("guile" ,guile-2.2))) + (list guile-2.2)) (synopsis "Formatting combinators for Guile") (description "The @code{(srfi-159)} module and its sub-modules implement the @@ -3328,9 +3161,9 @@ more expressive and flexible than the traditional @code{format} procedure.") (arguments '(#:not-compiled-file-regexp "body\\.scm$")) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (propagated-inputs - `(("guile-srfi-145" ,guile-srfi-145))) + (list guile-srfi-145)) (home-page "https://srfi.schemers.org/srfi-180/") (synopsis "JSON parser and printer for Guile") (description @@ -3339,6 +3172,51 @@ It also supports parsing JSON objects that may be bigger than memory with a stre API.") (license license:expat)))) +(define-public guile-srfi-189 + (let ((commit "a0e3786702956c9e510d92746474ac988c2010ec") + (revision "0")) + (package + (name "guile-srfi-189") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + ;; This is a fork of: + ;; (url "https://github.com/scheme-requests-for-implementation/srfi-189") + ;; Upstream merge requested at: + ;; https://github.com/scheme-requests-for-implementation/srfi-189/pull/21 + ;; TODO switch over to the official repo when the PR gets merged + (url "https://github.com/attila-lendvai-patches/srfi-189") + (commit commit))) + (sha256 + (base32 + "0iqv4sjwbp4k87r9l9abzbs5yjcljm69m91kb1ypb03b0rx7napy")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file "test-syntax.scm") + (delete-file "test.scm"))) + (file-name (git-file-name name version)))) + (build-system guile-build-system) + (arguments + '(#:not-compiled-file-regexp "srfi/189\\.scm$")) ; it's INCLUDE'd + (native-inputs + (list guile-3.0)) + (propagated-inputs + (list guile-srfi-145)) + (home-page "https://srfi.schemers.org/srfi-189/") + (synopsis "Scheme SRFI implementation of Maybe and Either") + (description + "This SRFI defines two disjoint immutable container types known as +Maybe and Either, both of which can contain objects collectively known +as their payload. A Maybe object is either a Just object or the unique +object Nothing (which has no payload); an Either object is either a Right +object or a Left object. Maybe represents the concept of optional values; +Either represents the concept of values which are either correct (Right) +or errors (Left).") + (license license:expat)))) + (define-public emacsy (package (name "emacsy") @@ -3379,14 +3257,14 @@ API.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("texinfo" ,texinfo) - ("texlive" ,(texlive-union (list texlive-generic-epsf))))) + ("texlive" ,(texlive-updmap.cfg (list texlive-epsf))))) (inputs - `(("dbus-glib" ,dbus-glib) - ("guile" ,guile-3.0) - ("guile-lib" ,guile-lib) - ("guile-readline" ,guile-readline) - ("freeglut" ,freeglut) - ("webkitgtk" ,webkitgtk))) + (list dbus-glib + guile-3.0 + guile-lib + guile-readline + freeglut + webkitgtk)) (propagated-inputs `(("glib-networking" ,glib-networking) ("gssettings-desktop-schemas" ,gsettings-desktop-schemas))) @@ -3498,10 +3376,7 @@ in C using Gtk+-3 and WebKitGtk.") #t)))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("guile" ,guile-2.2))) + (list autoconf automake pkg-config guile-2.2)) (synopsis "JPEG file parsing library for Guile") (description "Guile-JPEG is a Scheme library to parse JPEG image files and to @@ -3569,6 +3444,16 @@ perform geometrical transforms on JPEG images.") (srfi srfi-26)) #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-webkitgtk + (lambda _ + ;; Adapt to the version we have in Guix. + (substitute* "configure.ac" + (("webkit2gtk-4\\.0") "webkit2gtk-4.1") + (("webkit2gtk-web-extension-4\\.0") + "webkit2gtk-web-extension-4.1")) + + (substitute* "typelib/Makefile.am" + (("WebKit2-4\\.0") "WebKit2-4.1")))) (add-before 'check 'start-xorg-server (lambda* (#:key inputs #:allow-other-keys) ;; The test suite requires a running X server. @@ -3659,11 +3544,9 @@ feature-set, fully programmable in Guile Scheme.") (string-append (assoc-ref inputs "vigra-c") "/lib")) #t))))) (inputs - `(("vigra" ,vigra) - ("vigra-c" ,vigra-c) - ("guile" ,guile-2.2))) + (list vigra vigra-c guile-2.2)) (native-inputs - `(("texlive" ,(texlive-union (list texlive-booktabs + `(("texlive" ,(texlive-updmap.cfg (list texlive-booktabs texlive-lm texlive-siunitx texlive-standalone @@ -3713,8 +3596,7 @@ clean and easy to use high level API.") (invoke "guile" "-L" "mod" "-s" "test/test-ffi-fftw.scm")))))) (inputs - `(("fftw" ,fftw) - ("guile" ,guile-2.2))) + (list fftw guile-2.2)) (home-page "https://github.com/lloda/guile-ffi-fftw/") (synopsis "Access FFTW through Guile's FFI") (description "This is a minimal set of Guile FFI bindings for the FFTW @@ -3742,9 +3624,9 @@ anything other than straight complex DFTs.") (modify-phases %standard-phases (delete 'build)))) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("guile" ,guile-2.2))) + (list guile-2.2)) (home-page "https://ngyro.com/software/srfi-64-driver.html") (synopsis "Automake test driver for SRFI 64 test suites") (description "This package provides an Automake test driver that can @@ -3765,9 +3647,9 @@ tests being run, resulting clearer and more specific output.") "109p4n39ln44cxvwdccf9kgb96qx54makvd2ir521ssz6wchjyag")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://ngyro.com/software/guile-semver.html") (synopsis "Semantic Versioning (SemVer) for Guile") (description "This Guile library provides tools for reading, @@ -3775,15 +3657,12 @@ comparing, and writing Semantic Versions. It also includes ranges in the style of the Node Package Manager (NPM).") (license license:gpl3+))) -(define-public guile3.0-semver - (deprecated-package "guile3.0-semver" guile-semver)) - (define-public guile2.2-semver (package (inherit guile-semver) (name "guile2.2-semver") (inputs - `(("guile" ,guile-2.2))))) + (list guile-2.2)))) (define-public guile-hashing (package @@ -3828,7 +3707,7 @@ the style of the Node Package Manager (NPM).") (rename-file "private" "hashing/private") #t))))) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (synopsis "Cryprographic hash functions implemented in Scheme") (description "The @code{(hashing @dots{})} modules implement cryptographic hash @@ -3841,10 +3720,7 @@ SHA-512).") (inherit guile-hashing) (name "guile2.2-hashing") (native-inputs - `(("guile" ,guile-2.2))))) - -(define-public guile3.0-hashing - (deprecated-package "guile3.0-hashing" guile-hashing)) + (list guile-2.2)))) (define-public guile-packrat (package @@ -3873,7 +3749,7 @@ SHA-512).") (object->string '(only (guile) error)))) #t))))) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (synopsis "Packrat parser library in R6RS Scheme") (description "This is an R6RS Scheme adaptation of the @@ -3933,9 +3809,9 @@ and space linear in the size of the input text.") #t))))) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (propagated-inputs - `(("guile-packrat" ,guile-packrat))) + (list guile-packrat)) (synopsis "D-Bus protocol implementation in R6RS Scheme") (description "AC/D-Bus is an implementation of the D-Bus wire protocol. D-Bus is an @@ -3971,15 +3847,11 @@ gnome-keyring, and many more.") #t)))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + (list autoconf automake pkg-config texinfo)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (propagated-inputs - `(("guile-irregex" ,guile-irregex) - ("guile-gcrypt" ,guile-gcrypt))) + (list guile-irregex guile-gcrypt)) (home-page "https://notabug.org/cwebber/guile-webutils") (synopsis "Web application authoring utilities for Guile") (description @@ -3992,10 +3864,9 @@ as signed sessions, multipart message support, etc.") (inherit guile-webutils) (name "guile2.2-webutils") (inputs - `(("guile" ,guile-2.2))) + (list guile-2.2)) (propagated-inputs - `(("guile-irregex" ,guile2.2-irregex) - ("guile-gcrypt" ,guile2.2-gcrypt))))) + (list guile2.2-irregex guile2.2-gcrypt)))) (define-public guile-lens (let ((commit "14b15d07255f9d3f55d40a3b750d13c9ee3a154f") @@ -4021,12 +3892,12 @@ as signed sessions, multipart message support, etc.") (setenv "HOME" "/tmp") ; for ~/.hall (invoke "hall" "dist" "-x")))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("guile" ,guile-3.0) - ("guile-hall" ,guile-hall) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + (list autoconf + automake + guile-3.0 + guile-hall + pkg-config + texinfo)) (home-page "https://gitlab.com/a-sassmannshausen/guile-lens.git") (synopsis "Composable lenses for data structures in Guile") (description @@ -4041,8 +3912,8 @@ over, or update a value in arbitrary data structures.") (inherit guile-lens) (name "guile2.2-lens") (native-inputs - `(("guile" ,guile-2.2) - ,@(alist-delete "guile" (package-native-inputs guile-lens)))))) + (modify-inputs (package-native-inputs guile-lens) + (replace "guile" guile-2.2))))) (define-public guile-xapian (package @@ -4057,21 +3928,26 @@ over, or update a value in arbitrary data structures.") (file-name (git-file-name name version)) (sha256 (base32 - "16k61f1jn3g48jaf3730b9l0izr5j933jzyri73nmcnjd09gm35i")))) + "16k61f1jn3g48jaf3730b9l0izr5j933jzyri73nmcnjd09gm35i")) + (modules '((guix build utils))) + (snippet + ;; Guile >= 3.0.7 no longer uses libltdl so we need to explicitly add + ;; ".libs" so that 'load-extension' finds the '.so' file. + '(substitute* "pre-inst-env.in" + (("^LD_LIBRARY_PATH=.*$") + "LD_LIBRARY_PATH=\"$abs_top_builddir/.libs\"\n"))))) (build-system gnu-build-system) (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings (inputs - `(("guile" ,guile-3.0) - ("xapian" ,xapian) - ("zlib" ,zlib))) + (list guile-3.0 xapian zlib)) (native-inputs - `(("autoconf" ,autoconf) - ("autoconf-archive" ,autoconf-archive) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("swig" ,swig))) + (list autoconf + autoconf-archive + automake + libtool + pkg-config + swig)) (synopsis "Guile bindings for Xapian") (description "@code{guile-xapian} provides Guile bindings for Xapian, a search engine library. Xapian is a highly adaptable toolkit which allows @@ -4085,11 +3961,8 @@ models and also supports a rich set of boolean query operators.") (inherit guile-xapian) (name "guile2.2-xapian") (inputs - `(("guile" ,guile-2.2) - ,@(alist-delete "guile" (package-inputs guile-xapian)))))) - -(define-public guile3.0-xapian - (deprecated-package "guile3.0-xapian" guile-xapian)) + (modify-inputs (package-inputs guile-xapian) + (replace "guile" guile-2.2))))) (define-public guile-torrent (package @@ -4106,14 +3979,14 @@ models and also supports a rich set of boolean query operators.") "1yiagi55ncq1x7s9n7salzywjm4l96y3n7y3s47a9anvz87mrmim")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("guile" ,guile-2.2) - ("texinfo" ,texinfo) - ("perl" ,perl) - ("pkg-config" ,pkg-config))) + (list autoconf + automake + guile-2.2 + texinfo + perl + pkg-config)) (propagated-inputs - `(("guile-gcrypt" ,guile-gcrypt))) + (list guile-gcrypt)) (home-page "https://github.com/o-nly/torrent") (synopsis "Torrent library for GNU Guile") (description "This package provides facilities for working with @@ -4140,12 +4013,9 @@ according to Bitorrent BEP003.") (arguments `(#:configure-flags '("--enable-gnutls=yes"))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo))) + (list autoconf automake texinfo)) (inputs - `(("gnutls" ,gnutls) - ("guile" ,guile-3.0))) + (list gnutls guile-3.0)) (home-page "https://github.com/rekado/guile-irc") (synopsis "IRC library for Guile") (description "This package provides a Guile library for @dfn{Internet @@ -4174,20 +4044,15 @@ Relay Chat} (IRC).") '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) + (list autoconf automake pkg-config)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (synopsis "Websocket server/client for Guile") (description "Guile-websocket provides an implementation of the WebSocket protocol as defined by RFC 6455.") (home-page "https://git.dthompson.us/guile-websocket.git") (license license:lgpl3+)))) -(define-public guile3.0-websocket - (deprecated-package "guile3.0-websocket" guile-websocket)) - (define-public guile-rdf (package (name "guile-rdf") @@ -4206,12 +4071,9 @@ WebSocket protocol as defined by RFC 6455.") (arguments `(#:tests? #f)); tests require network (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (native-inputs - `(("automake" ,automake) - ("autoconf" ,autoconf) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + (list automake autoconf pkg-config texinfo)) (home-page "https://framagit.org/tyreunom/guile-rdf") (synopsis "Guile implementation of the RDF abstract and concrete syntaxes") (description "Guile RDF is an implementation of the RDF (Resource Description @@ -4247,12 +4109,9 @@ manipulating graphs and datasets.") ("guile-json" ,guile-json-4) ("guile-rdf" ,guile-rdf))) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (native-inputs - `(("automake" ,automake) - ("autoconf" ,autoconf) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + (list automake autoconf pkg-config texinfo)) (home-page "https://framagit.org/tyreunom/guile-jsonld") (synopsis "Guile implementation of the JsonLD API specification") (description "Guile JsonLD is an implementation of the JsonLD (Json for @@ -4298,7 +4157,7 @@ more objects or strings, represented by a Json object or an IRI.") files) #t))))) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://github.com/weinholt/struct-pack") (synopsis "R6RS library for working with packed byte structures") (description @@ -4342,9 +4201,9 @@ similar to struct in Python or pack and unpack in Perl.") files) #t))))) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (propagated-inputs - `(("guile-struct-pack" ,guile-struct-pack))) + (list guile-struct-pack)) (home-page "https://github.com/weinholt/machine-code") (synopsis "Tools that relate to machine code and object formats") (description @@ -4390,7 +4249,7 @@ object formats and related areas.") files) #t))))) (native-inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://github.com/weinholt/laesare") (synopsis "R6RS Scheme library that provides a reader") (description @@ -4444,14 +4303,9 @@ errors.") out (target-guile-effective-version)))) #t)))))) (inputs - `(("guile" ,guile-3.0) - ("avahi" ,avahi))) + (list guile-3.0 avahi)) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + (list autoconf automake libtool pkg-config texinfo)) (synopsis "Guile bindings to Avahi") (description "This package provides bindings for Avahi. It allows programmers to @@ -4461,45 +4315,6 @@ Discovery (DNS-SD).") (home-page "https://www.nongnu.org/guile-avahi/") (license license:lgpl3+)))) -(define-public guile-mkdir-p - (package - (name "guile-mkdir-p") - (version "1.0.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://code.divoplade.fr/mkdir-p.git") - (commit (string-append "v" version)))) - (sha256 - (base32 "01k20rjcv6p0spmw8ls776aar6bfw0jxw46d2n12w0cb2p79xjv8")) - (file-name (git-file-name name version)) - (snippet - `(begin - (with-output-to-file ".tarball-version" - (lambda _ (format #t "~a~%" ,version))) - #t)))) - (build-system gnu-build-system) - (arguments `()) - (native-inputs - `(("guile" ,guile-3.0) - ("texinfo" ,texinfo) - ("autoconf" ,autoconf) - ("autoconf-archive" ,autoconf-archive) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal))) - (inputs `(("guile" ,guile-3.0))) - (synopsis "Implementation of a recursive @code{mkdir} for Guile") - (description - "This package provides within the @code{(mkdir-p)} module the -@code{mkdir-p} function that tries to create the chain of directories -recursively. It also provides new versions of @code{open-output-file}, -@code{call-with-output-file} and @code{with-output-to-file} to create the -directory of its argument if it does not exist.") - (home-page "https://mkdir-p.divoplade.fr") - (license license:asl2.0))) - (define-public guile-jwt (package (name "guile-jwt") @@ -4516,13 +4331,11 @@ directory of its argument if it does not exist.") "1p8sapiv5im18rjnzc8xnw6y7dr661rycf9g10z5ww0dl4rfz3z1")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config))) + (list autoconf automake pkg-config)) (propagated-inputs - `(("guile-json" ,guile-json-4))) + (list guile-json-4)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://github.com/aconchillo/guile-jwt") (synopsis "JSON Web Token library for Guile") (description @@ -4547,12 +4360,9 @@ JWT. Supported algorithms: HS256, HS384, HS512.") (build-system gnu-build-system) (arguments `()) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-3.0))) - (propagated-inputs `(("libsodium" ,libsodium))) + (list autoconf automake pkg-config texinfo)) + (inputs (list guile-3.0)) + (propagated-inputs (list libsodium)) (synopsis "Guile bindings to the libsodium cryptographic library") (description "This package provides Guile bindings to the libsodium cryptographic library @@ -4576,15 +4386,15 @@ tools.") (build-system gnu-build-system) (arguments '()) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo) - ;; test dependency - ("guile-srfi-180" ,guile-srfi-180))) - (inputs `(("guile" ,guile-3.0))) + (list autoconf + automake + pkg-config + texinfo + ;; test dependency + guile-srfi-180)) + (inputs (list guile-3.0)) (propagated-inputs - `(("guile-sodium" ,guile-sodium))) + (list guile-sodium)) (synopsis "Guile implementation of the Encoding for Robust Immutable Storage (ERIS)") (description "Guile-ERIS is the reference implementation of the Encoding for Robust @@ -4612,7 +4422,7 @@ read-capability.") (arguments `(#:compile-flags '("--r6rs"))) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://gitlab.com/joolean/r6rs-protobuf/") (synopsis "Scheme implementation of Protocol Buffers") (description @@ -4643,18 +4453,18 @@ including parsing and code generation.") (delete-file-recursively "docs") #t)) (add-after 'install 'install-info-documentation - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((share (string-append (assoc-ref outputs "out") "/share")) (doc (string-append share "/doc/" ,name "-" ,version)) (info (string-append share "/info/")) - (makeinfo (string-append (assoc-ref %build-inputs "texinfo") - "/bin/makeinfo"))) + (makeinfo (search-input-file inputs + "/bin/makeinfo"))) (invoke makeinfo "guile-shapefile.texi" "-o" info) #t)))))) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (native-inputs - `(("texinfo" ,texinfo))) + (list texinfo)) (home-page "https://github.com/HugoNikanor/guile-shapefile") (synopsis "Parse shapefiles in Guile") (description @@ -4677,16 +4487,11 @@ including parsing and code generation.") "1m2x62n3x5hi5vnsvv2zgqhgpzrfq7r5095fzzjd1aaybi9i9igg")))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo) - ("sed" ,sed))) + (list autoconf automake pkg-config texinfo sed)) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (propagated-inputs - `(("guile-bytestructures" ,guile-bytestructures) - ("nyacc" ,nyacc))) + (list guile-bytestructures nyacc)) (home-page "https://git.elephly.net/software/guile-drmaa.git") (synopsis "Guile bindings to DRMAA") (description "This project provides Guile bindings to the DRMAA library @@ -4695,8 +4500,8 @@ schedulers.") (license license:gpl3+))) (define-public guile-libyaml - (let ((commit "f5d33a6880e96571d3cb079ed7755ffc156cac46") - (revision "1")) + (let ((commit "2bdacb72a65ab63264b2edc9dac9692df7ec9b3e") + (revision "2")) (package (name "guile-libyaml") (version (git-version "0" revision commit)) @@ -4709,7 +4514,7 @@ schedulers.") (file-name (git-file-name name version)) (sha256 (base32 - "12x91983fh1j39zy7kbk19acc1rqdh8515ddx1mh7l26j04k9wgq")))) + "1bssby1ri1vjll2rvi8b33xr2ghwjyxsd4yc15najj3h8n2ss87i")))) (build-system gnu-build-system) (arguments `(#:modules (((guix build guile-build-system) @@ -4723,38 +4528,23 @@ schedulers.") (delete 'configure) (add-after 'unpack 'remove-unused-files (lambda* (#:key inputs #:allow-other-keys) - (for-each delete-file - '("guix.scm" "demo1.yml" "demo1.scm" - "yaml/libyaml.scm" - ;; This file is mismatched with the generated FFI code. - "yaml/ffi-help-rt.scm")) - (copy-file (string-append (assoc-ref inputs "nyacc") - "/share/guile/site/3.0/system/ffi-help-rt.scm") - "yaml/ffi-help-rt.scm") - (substitute* "yaml/ffi-help-rt.scm" - (("system ffi-help-rt") "yaml ffi-help-rt")) - #true)) + (for-each delete-file '("guix.scm" "demo1.yml" "demo1.scm")))) (add-before 'build 'build-ffi (lambda* (#:key inputs #:allow-other-keys) (invoke "guild" "compile-ffi" "--no-exec" ; allow us to patch the generated file "yaml/libyaml.ffi") (substitute* "yaml/libyaml.scm" - (("system ffi-help-rt") "yaml ffi-help-rt") (("dynamic-link \"libyaml\"") (format #false "dynamic-link \"~a/lib/libyaml\"" - (assoc-ref inputs "libyaml")))) - #true)) + (assoc-ref inputs "libyaml")))))) (replace 'build (assoc-ref guile:%standard-phases 'build)) (delete 'install)))) (inputs - `(("guile" ,guile-3.0) - ("libyaml" ,libyaml))) + (list guile-3.0 libyaml)) (propagated-inputs - `(("guile-bytestructures" ,guile-bytestructures))) - (native-inputs - `(("nyacc" ,nyacc))) + (list guile-bytestructures nyacc)) (home-page "https://github.com/mwette/guile-libyaml") (synopsis "Guile wrapper for libyaml") (description @@ -4780,9 +4570,9 @@ ffi-helper from nyacc.") (build-system cmake-build-system) (arguments `(#:tests? #f)) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("guile" ,guile-2.2))) + (list guile-2.2)) (home-page "https://github.com/arximboldi/schmutz") (synopsis "Bind C++ code to Scheme") (description "Schmutz is a header-only library to declare Scheme bindings @@ -4805,11 +4595,8 @@ or @code{LuaBind} but for Scheme.") (build-system gnu-build-system) (arguments `()) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) - (inputs `(("guile" ,guile-3.0))) + (list autoconf automake pkg-config texinfo)) + (inputs (list guile-3.0)) (synopsis "Guile implementation of CBOR") (description "The Concise Binary Object Representation (CBOR), as specified by RFC 8949, is @@ -4833,9 +4620,9 @@ a Guile implementation of CBOR.") "03mwi1l3354x52nar0zwhcm0x29yai9xjln4p4gbchwvx5dsr6fb")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) + (list pkg-config)) (inputs - `(("guile" ,guile-3.0))) + (list 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 @@ -4860,7 +4647,7 @@ in a large number of randomly generated test cases.") "118d84p443w7hrslv8hjyhgws631ia08mggiyklkmk0b9plfdsvz")))) (build-system guile-build-system) (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (home-page "https://notabug.org/ZelphirKaltstahl/guile-fslib") (synopsis "Helper functions for working with locations in file systems") (description @@ -4871,7 +4658,7 @@ locations.") (define-public guile-netlink (package (name "guile-netlink") - (version "1.0.1") + (version "1.1.1") (source (origin (method git-fetch) @@ -4881,17 +4668,16 @@ locations.") (file-name (git-file-name name version)) (sha256 (base32 - "03zmsha2d7whlwb52gna83jdas9bqi18rq3sss7kkicv814qb35g")))) + "0jcl6mzqy04if5drflmygmggbgzsxa42mlmskqb3cfqmksq0zj0y")))) (build-system gnu-build-system) - (arguments - `(#:tests? #f)); no tests (inputs - `(("guile" ,guile-3.0))) + (list guile-3.0)) (native-inputs - `(("automake" ,automake) - ("autoconf" ,autoconf) - ("pkg-config" ,pkg-config) - ("texinfo" ,texinfo))) + (list automake + autoconf + pkg-config + guile-3.0 ;for 'guild compile' + guile.m4 + texinfo)) (home-page "https://git.lepiller.eu/guile-netlink") (synopsis "Netlink protocol implementation for Guile") (description "Guile Netlink is a GNU Guile library providing an implementation @@ -4901,3 +4687,240 @@ It provides a generic library for writing implementations of a netlink protocol, a low-level rtnetlink implementation that uses that library and a high-level API for network management that uses rtnetlink.") (license license:gpl3+))) + +(define-public guile-gitlab + (package + (name "guile-gitlab") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/artyom-poptsov/guile-gitlab") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0srkmchd4kmfa7q65r6fdzwklhgdlck1ll0s7smzs8ddjdgz2lwm")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings + #:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (guile-lib (assoc-ref inputs "guile-lib")) + (json (assoc-ref inputs "guile-json")) + (tls (assoc-ref inputs "guile-gnutls")) + (version (target-guile-effective-version)) + (scm (string-append "/share/guile/site/" + version)) + (go (string-append "/lib/guile/" + version "/site-ccache"))) + (wrap-program (string-append bin "/gitlab-cli") + `("GUILE_LOAD_PATH" prefix + (,(string-append out scm) + ,(string-append guile-lib scm) + ,(string-append json scm) + ,(string-append tls scm))) + `("GUILE_LOAD_COMPILED_PATH" prefix + (,(string-append out go) + ,(string-append guile-lib go) + ,(string-append json go) + ,(string-append tls go)))))))))) + (native-inputs + (list autoconf automake pkg-config texinfo)) + (inputs + `(("bash" ,bash-minimal) + ("guile" ,guile-2.2) + ("guile-json" ,guile2.2-json) + ("guile-lib" ,guile2.2-lib) + ("guile-gnutls" ,guile2.2-gnutls))) + (home-page "https://github.com/artyom-poptsov/guile-gitlab") + (synopsis "Guile interface to GitLab") + (description + "This package provides bindings to the GitLab Community Edition REST API +as well as the @samp{gitlab-cli} command line tool for interacting with a +GitLab instance.") + (license license:gpl3))) + +(define-public guile-smc + (package + (name "guile-smc") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/artyom-poptsov/guile-smc") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0szkjmasi70m1vppck7nhdxg4lnxzjq6mihi6r1552s8sxm5z008")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings + #:modules (((guix build guile-build-system) + #:select (target-guile-effective-version)) + ,@%gnu-build-system-modules) + #:imported-modules ((guix build guile-build-system) + ,@%gnu-build-system-modules) + #:phases + (modify-phases %standard-phases + (delete 'strip) + (add-after 'configure 'patch + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "modules/smc/core/log.scm" + ((" #:use-module \\(logging logger\\)") + (string-append + " #:use-module (logging logger)\n" + " #:use-module (logging rotating-log)")) + (("#:init-value \"logger\"") + (format #f + "#:init-value \"~a/bin/logger\"" + (assoc-ref inputs "inetutils"))) + (("\\(add-handler! %logger %syslog\\)") + (string-append + "(add-handler! %logger\n" + " (make <rotating-log>\n" + " #:file-name \"smc.log\"))\n"))) + #t)) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (guile-lib (assoc-ref inputs "guile-lib")) + (version (target-guile-effective-version)) + (scm (string-append "/share/guile/site/" + version)) + (go (string-append "/lib/guile/" + version "/site-ccache"))) + (wrap-program (string-append bin "/smc") + `("GUILE_LOAD_PATH" prefix + (,(string-append out scm) + ,(string-append guile-lib scm))) + `("GUILE_LOAD_COMPILED_PATH" prefix + (,(string-append out go) + ,(string-append guile-lib go))))) + #t))))) + (native-inputs + (list autoconf automake pkg-config texinfo)) + (inputs + `(("bash" ,bash-minimal) + ("guile" ,guile-3.0) + ("guile-lib" ,guile-lib) + ("inetutils" ,inetutils))) + (home-page "https://github.com/artyom-poptsov/guile-smc") + (synopsis "GNU Guile state machine compiler") + (description + "Guile-SMC is a state machine compiler that allows users to describe +finite state machines (FSMs) in Scheme in terms of transition tables. It is +capable to generate such transition tables from a @url{https://plantuml.com/, +PlantUML} state diagrams. + +A transition table can be verified and checked for dead-ends and infinite +loops. Also Guile-SMC FSMs gather statistics when they run. + +Guile-SMC comes with a Scheme program called @command{smc} -- a state machine +compiler itself. It produces a Scheme code for an FSM from the PlantUML +format. This tool is meant to be called on a PlantUML file when a program +with a FSM is being built (for example, from a Makefile.)") + (license license:gpl3))) + +(define-public guile-ini + (package + (name "guile-ini") + (version "0.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/artyom-poptsov/guile-ini") + (commit (string-append "v" version)))) + (file-name (string-append name "-" version)) + (sha256 + (base32 + "0injn60530valhx3gsmdp72g6z886yf0n08hscky21h3dafm14kc")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings + (native-inputs + (list autoconf automake pkg-config texinfo)) + (inputs + `(("bash" ,bash-minimal) + ("guile" ,guile-3.0) + ("guile-lib" ,guile-lib))) + (propagated-inputs + (list guile-smc)) + (home-page "https://github.com/artyom-poptsov/guile-ini") + (synopsis "Guile library for INI format support") + (description + "@code{guile-ini} is a GNU Guile library for working with the +@url{https://en.wikipedia.org/wiki/INI_file, INI format}. This library +provides API for reading and writing INI data.") + (license license:gpl3))) + +(define-public guile-schemetran + (let ((commit "3f5e15273ee88ba60ad8caf2de6302ad2bab582b") + (revision "1")) + (package + (name "guile-schemetran") + (version (git-version "0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/codetk/schemetran") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1r4nq7wmy854hvbkcc23sidn4kq3p7r4p15y5czwvd52p9djff3m")))) + (build-system guile-build-system) + (arguments + (list #:not-compiled-file-regexp "/doc/.*\\.scm$" + #:source-directory "src")) + (inputs + (list guile-3.0)) + (home-page "https://gitlab.com/codetk/schemetran") + (synopsis "Write Fortran in Scheme") + (description + "Fortran is great in expressing operations on multi-dimensional arrays +of numbers. Scheme is great at expressing your coding thoughts. This project +is an attempt to combine both into something useful.") + (license license:asl2.0)))) + +(define-public guile-kolam + (package + (name "guile-kolam") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://kolam.systemreboot.net/releases/kolam-" + version ".tar.lz")) + (sha256 + (base32 + "083r3n3wvzysa9jhlwjj1xppdm6ja56rkizr6hvj4q1806v8n6mn")))) + (build-system gnu-build-system) + (arguments + '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings + (native-inputs + (list guile-3.0 lzip)) + (propagated-inputs + (list guile-json-4)) + (home-page "https://kolam.systemreboot.net") + (synopsis "GraphQL implementation for Scheme") + (description "@code{guile-kolam} is a GraphQL implementation for Scheme. kolam +features a parser to parse and serialize GraphQL documents, a type system to +create GraphQL schemas, an execution engine to execute GraphQL queries, and a +HTTP handler to implement a HTTP GraphQL endpoint.") + (license license:agpl3+))) |