gnu: Explicitly refer to 'guile-json-1' when needed.
* gnu/packages/bioinformatics.scm (rcas-web)[inputs]: Change 'guile-json' to 'guile-json-1'. * gnu/packages/ci.scm (cuirass)[inputs]: Likewise. * gnu/packages/guile-xyz.scm (artanis)[inputs]: Likewise. * gnu/packages/guile-xyz.scm (jupyter-guile-kernel)[inputs]: Likewise. * gnu/packages/guile-xyz.scm (guile-mastodon)[inputs]: Likewise. * gnu/packages/mail.scm (mumi)[inputs]: Likewise. * gnu/packages/package-management.scm (guix)[inputs]: Likewise. * gnu/packages/package-management.scm (guix-daemon)[inputs]: Likewise. * gnu/packages/web.scm (hpcguix-web)[inputs]: Likewise.
This commit is contained in:
parent
584a3ca3a4
commit
91f55717ab
|
@ -8427,7 +8427,7 @@ library implementing most of the pipeline's features.")
|
||||||
`(("r-minimal" ,r-minimal)
|
`(("r-minimal" ,r-minimal)
|
||||||
("r-rcas" ,r-rcas)
|
("r-rcas" ,r-rcas)
|
||||||
("guile-next" ,guile-2.2)
|
("guile-next" ,guile-2.2)
|
||||||
("guile-json" ,guile-json)
|
("guile-json" ,guile-json-1)
|
||||||
("guile-redis" ,guile-redis)))
|
("guile-redis" ,guile-redis)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)))
|
||||||
|
|
|
@ -121,7 +121,7 @@
|
||||||
`(("guile" ,guile-2.2)
|
`(("guile" ,guile-2.2)
|
||||||
("guile-fibers" ,guile-fibers)
|
("guile-fibers" ,guile-fibers)
|
||||||
("guile-gcrypt" ,guile-gcrypt)
|
("guile-gcrypt" ,guile-gcrypt)
|
||||||
("guile-json" ,guile-json)
|
("guile-json" ,guile-json-1)
|
||||||
("guile-sqlite3" ,guile-sqlite3)
|
("guile-sqlite3" ,guile-sqlite3)
|
||||||
("guile-git" ,guile-git)
|
("guile-git" ,guile-git)
|
||||||
;; FIXME: this is propagated by "guile-git", but it needs to be among
|
;; FIXME: this is propagated by "guile-git", but it needs to be among
|
||||||
|
|
|
@ -146,7 +146,7 @@
|
||||||
;; projects.
|
;; projects.
|
||||||
;; TODO: Add guile-dbi and guile-dbd optional dependencies.
|
;; TODO: Add guile-dbi and guile-dbd optional dependencies.
|
||||||
(inputs `(("guile" ,guile-2.2)
|
(inputs `(("guile" ,guile-2.2)
|
||||||
("guile-json" ,guile-json)
|
("guile-json" ,guile-json-1)
|
||||||
("guile-redis" ,guile-redis)))
|
("guile-redis" ,guile-redis)))
|
||||||
(native-inputs `(("bash" ,bash) ;for the `source' builtin
|
(native-inputs `(("bash" ,bash) ;for the `source' builtin
|
||||||
("pkgconfig" ,pkg-config)
|
("pkgconfig" ,pkg-config)
|
||||||
|
@ -844,7 +844,7 @@ messaging library.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("openssl" ,openssl)
|
`(("openssl" ,openssl)
|
||||||
("guile" ,guile-2.2)
|
("guile" ,guile-2.2)
|
||||||
("guile-json" ,guile-json)
|
("guile-json" ,guile-json-1)
|
||||||
("guile-simple-zmq" ,guile-simple-zmq)))
|
("guile-simple-zmq" ,guile-simple-zmq)))
|
||||||
(synopsis "Guile kernel for the Jupyter Notebook")
|
(synopsis "Guile kernel for the Jupyter Notebook")
|
||||||
(description
|
(description
|
||||||
|
@ -1008,7 +1008,7 @@ Scheme by using Guile’s foreign function interface.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("guile" ,guile-2.2)
|
`(("guile" ,guile-2.2)
|
||||||
("gnutls" ,gnutls)
|
("gnutls" ,gnutls)
|
||||||
("guile-json" ,guile-json)))
|
("guile-json" ,guile-json-1)))
|
||||||
(home-page "https://framagit.org/prouby/guile-mastodon")
|
(home-page "https://framagit.org/prouby/guile-mastodon")
|
||||||
(synopsis "Guile Mastodon REST API module")
|
(synopsis "Guile Mastodon REST API module")
|
||||||
(description "This package provides Guile modules to access the
|
(description "This package provides Guile modules to access the
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
;;; GNU Guix --- Functional package management for GNU
|
;;; GNU Guix --- Functional package management for GNU
|
||||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
|
||||||
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
|
;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net>
|
||||||
;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com>
|
;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com>
|
||||||
|
@ -2848,7 +2848,7 @@ replacement for the @code{urlview} program.")
|
||||||
`(("guile-debbugs" ,guile-debbugs-next)
|
`(("guile-debbugs" ,guile-debbugs-next)
|
||||||
("guile-email" ,guile-email)
|
("guile-email" ,guile-email)
|
||||||
("guile-fibers" ,guile-fibers)
|
("guile-fibers" ,guile-fibers)
|
||||||
("guile-json" ,guile-json)
|
("guile-json" ,guile-json-1)
|
||||||
("guile-syntax-highlight" ,guile-syntax-highlight)
|
("guile-syntax-highlight" ,guile-syntax-highlight)
|
||||||
("guile" ,guile-2.2)))
|
("guile" ,guile-2.2)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
|
|
|
@ -293,7 +293,7 @@
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("gnutls" ,gnutls)
|
`(("gnutls" ,gnutls)
|
||||||
("guile-gcrypt" ,guile-gcrypt)
|
("guile-gcrypt" ,guile-gcrypt)
|
||||||
("guile-json" ,guile-json)
|
("guile-json" ,guile-json-1)
|
||||||
("guile-sqlite3" ,guile-sqlite3)
|
("guile-sqlite3" ,guile-sqlite3)
|
||||||
("guile-ssh" ,guile-ssh)
|
("guile-ssh" ,guile-ssh)
|
||||||
("guile-git" ,guile-git)))
|
("guile-git" ,guile-git)))
|
||||||
|
@ -325,7 +325,7 @@ the Nix package manager.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("gnutls" ,gnutls)
|
`(("gnutls" ,gnutls)
|
||||||
("guile-git" ,guile-git)
|
("guile-git" ,guile-git)
|
||||||
("guile-json" ,guile-json)
|
("guile-json" ,guile-json-1)
|
||||||
("guile-gcrypt" ,guile-gcrypt)
|
("guile-gcrypt" ,guile-gcrypt)
|
||||||
,@(fold alist-delete (package-inputs guix)
|
,@(fold alist-delete (package-inputs guix)
|
||||||
'("boot-guile" "boot-guile/i686" "util-linux"))))
|
'("boot-guile" "boot-guile/i686" "util-linux"))))
|
||||||
|
|
|
@ -6509,7 +6509,7 @@ compressed JSON header blocks.
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
`(("guile" ,guile-2.2)
|
`(("guile" ,guile-2.2)
|
||||||
("guile-commonmark" ,guile-commonmark)
|
("guile-commonmark" ,guile-commonmark)
|
||||||
("guile-json" ,guile-json)))
|
("guile-json" ,guile-json-1)))
|
||||||
(home-page "https://github.com/UMCUGenetics/hpcguix-web")
|
(home-page "https://github.com/UMCUGenetics/hpcguix-web")
|
||||||
(synopsis "Web interface for cluster deployments of Guix")
|
(synopsis "Web interface for cluster deployments of Guix")
|
||||||
(description "Hpcguix-web provides a web interface to the list of packages
|
(description "Hpcguix-web provides a web interface to the list of packages
|
||||||
|
|
Loading…
Reference in New Issue