gnu: Add "guile3.0-" package variants.
* gnu/packages/guile.scm (package-for-guile-3.0): New procedure. (guile3.0-json, guile3.0-gdbm-ffi, guile3.0-bytestructures): New variables. * gnu/packages/gnupg.scm (guile3.0-gcrypt): New variable. * gnu/packages/guile-xyz.scm (guile3.0-minikanren, guile3.0-irregex): New variables.
This commit is contained in:
parent
7089f98ef1
commit
89a99d53f5
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr>
|
;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr>
|
||||||
;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org>
|
||||||
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||||
|
@ -470,6 +470,14 @@ interface (FFI) of Guile.")
|
||||||
`(("guile" ,guile-2.0)
|
`(("guile" ,guile-2.0)
|
||||||
,@(alist-delete "guile" (package-inputs guile-gcrypt))))))
|
,@(alist-delete "guile" (package-inputs guile-gcrypt))))))
|
||||||
|
|
||||||
|
(define-public guile3.0-gcrypt
|
||||||
|
(package
|
||||||
|
(inherit guile-gcrypt)
|
||||||
|
(name "guile3.0-gcrypt")
|
||||||
|
(inputs
|
||||||
|
`(("guile" ,guile-next)
|
||||||
|
,@(alist-delete "guile" (package-inputs guile-gcrypt))))))
|
||||||
|
|
||||||
(define-public python-gpg
|
(define-public python-gpg
|
||||||
(package
|
(package
|
||||||
(name "python-gpg")
|
(name "python-gpg")
|
||||||
|
|
|
@ -1722,6 +1722,12 @@ See http://minikanren.org/ for more on miniKanren generally.")
|
||||||
(name "guile2.0-minikanren")
|
(name "guile2.0-minikanren")
|
||||||
(native-inputs `(("guile" ,guile-2.0)))))
|
(native-inputs `(("guile" ,guile-2.0)))))
|
||||||
|
|
||||||
|
(define-public guile3.0-minikanren
|
||||||
|
(package
|
||||||
|
(inherit guile-minikanren)
|
||||||
|
(name "guile3.0-minikanren")
|
||||||
|
(native-inputs `(("guile" ,guile-next)))))
|
||||||
|
|
||||||
(define-public guile-irregex
|
(define-public guile-irregex
|
||||||
(package
|
(package
|
||||||
(name "guile-irregex")
|
(name "guile-irregex")
|
||||||
|
@ -1768,6 +1774,12 @@ inspired by the SCSH regular expression system.")
|
||||||
(name "guile2.0-irregex")
|
(name "guile2.0-irregex")
|
||||||
(native-inputs `(("guile" ,guile-2.0)))))
|
(native-inputs `(("guile" ,guile-2.0)))))
|
||||||
|
|
||||||
|
(define-public guile3.0-irregex
|
||||||
|
(package
|
||||||
|
(inherit guile-irregex)
|
||||||
|
(name "guile3.0-irregex")
|
||||||
|
(native-inputs `(("guile" ,guile-next)))))
|
||||||
|
|
||||||
(define-public haunt
|
(define-public haunt
|
||||||
(package
|
(package
|
||||||
(name "haunt")
|
(name "haunt")
|
||||||
|
|
|
@ -396,6 +396,10 @@ GNU@tie{}Guile. Use the @code{(ice-9 readline)} module and call its
|
||||||
(package-input-rewriting `((,guile-2.2 . ,guile-2.0))
|
(package-input-rewriting `((,guile-2.2 . ,guile-2.0))
|
||||||
(guile-variant-package-name "guile2.0")))
|
(guile-variant-package-name "guile2.0")))
|
||||||
|
|
||||||
|
(define package-for-guile-3.0
|
||||||
|
(package-input-rewriting `((,guile-2.2 . ,guile-next))
|
||||||
|
(guile-variant-package-name "guile3.0")))
|
||||||
|
|
||||||
(define-public guile-for-guile-emacs
|
(define-public guile-for-guile-emacs
|
||||||
(package (inherit guile-2.2)
|
(package (inherit guile-2.2)
|
||||||
(name "guile-for-guile-emacs")
|
(name "guile-for-guile-emacs")
|
||||||
|
@ -489,6 +493,9 @@ specification. These are the main features:
|
||||||
(base32
|
(base32
|
||||||
"14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz"))))))
|
"14m6b6g2maw0mkvfm4x63rqb54vgbpn1gcqs715ijw4bikfzlqfz"))))))
|
||||||
|
|
||||||
|
(define-public guile3.0-json
|
||||||
|
(package-for-guile-3.0 guile-json-3))
|
||||||
|
|
||||||
;; There are two guile-gdbm packages, one using the FFI and one with
|
;; There are two guile-gdbm packages, one using the FFI and one with
|
||||||
;; direct C bindings, hence the verbose name.
|
;; direct C bindings, hence the verbose name.
|
||||||
|
|
||||||
|
@ -541,6 +548,9 @@ Guile's foreign function interface.")
|
||||||
(define-public guile2.0-gdbm-ffi
|
(define-public guile2.0-gdbm-ffi
|
||||||
(package-for-guile-2.0 guile-gdbm-ffi))
|
(package-for-guile-2.0 guile-gdbm-ffi))
|
||||||
|
|
||||||
|
(define-public guile3.0-gdbm-ffi
|
||||||
|
(package-for-guile-3.0 guile-gdbm-ffi))
|
||||||
|
|
||||||
(define-public guile-sqlite3
|
(define-public guile-sqlite3
|
||||||
(package
|
(package
|
||||||
(name "guile-sqlite3")
|
(name "guile-sqlite3")
|
||||||
|
@ -602,6 +612,9 @@ type system, elevating types to first-class status.")
|
||||||
(define-public guile2.0-bytestructures
|
(define-public guile2.0-bytestructures
|
||||||
(package-for-guile-2.0 guile-bytestructures))
|
(package-for-guile-2.0 guile-bytestructures))
|
||||||
|
|
||||||
|
(define-public guile3.0-bytestructures
|
||||||
|
(package-for-guile-3.0 guile-bytestructures))
|
||||||
|
|
||||||
(define-public guile-git
|
(define-public guile-git
|
||||||
(package
|
(package
|
||||||
(name "guile-git")
|
(name "guile-git")
|
||||||
|
|
Loading…
Reference in New Issue