ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Explicitly refer to 'guile-json-1' when needed.

Browse source 
* 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:
Ludovic Courtès 2019-07-21 23:19:58 +02:00
parent 584a3ca3a4
commit 91f55717ab
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/bioinformatics.scm
View file

@ -8427,7 +8427,7 @@ (define-public rcas-web
`(("r-minimal" ,r-minimal)
("r-rcas" ,r-rcas)
("guile-next" ,guile-2.2)
("guile-json" ,guile-json)
("guile-json" ,guile-json-1)
("guile-redis" ,guile-redis)))
(native-inputs
`(("pkg-config" ,pkg-config)))

2
gnu/packages/ci.scm
View file

@ -121,7 +121,7 @@ (define-public cuirass
`(("guile" ,guile-2.2)
("guile-fibers" ,guile-fibers)
("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json)
("guile-json" ,guile-json-1)
("guile-sqlite3" ,guile-sqlite3)
("guile-git" ,guile-git)
;; FIXME: this is propagated by "guile-git", but it needs to be among

6
gnu/packages/guile-xyz.scm
View file

@ -146,7 +146,7 @@ (define-public artanis
;; projects.
;; TODO: Add guile-dbi and guile-dbd optional dependencies.
(inputs `(("guile" ,guile-2.2)
("guile-json" ,guile-json)
("guile-json" ,guile-json-1)
("guile-redis" ,guile-redis)))
(native-inputs `(("bash" ,bash) ;for the `source' builtin
("pkgconfig" ,pkg-config)
@ -844,7 +844,7 @@ (define-public jupyter-guile-kernel
(inputs
`(("openssl" ,openssl)
("guile" ,guile-2.2)
("guile-json" ,guile-json)
("guile-json" ,guile-json-1)
("guile-simple-zmq" ,guile-simple-zmq)))
(synopsis "Guile kernel for the Jupyter Notebook")
(description
@ -1008,7 +1008,7 @@ (define-public guile-mastodon
(inputs
`(("guile" ,guile-2.2)
("gnutls" ,gnutls)
("guile-json" ,guile-json)))
("guile-json" ,guile-json-1)))
(home-page "https://framagit.org/prouby/guile-mastodon")
(synopsis "Guile Mastodon REST API module")
(description "This package provides Guile modules to access the

4
gnu/packages/mail.scm
View file

@ -1,5 +1,5 @@
;;; 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 Ian Denhardt <ian@zenhack.net>
;;; Copyright © 2014 Sou Bunnbu <iyzsong@gmail.com>
@ -2848,7 +2848,7 @@ (define-public mumi
`(("guile-debbugs" ,guile-debbugs-next)
("guile-email" ,guile-email)
("guile-fibers" ,guile-fibers)
("guile-json" ,guile-json)
("guile-json" ,guile-json-1)
("guile-syntax-highlight" ,guile-syntax-highlight)
("guile" ,guile-2.2)))
(native-inputs

4
gnu/packages/package-management.scm
View file

@ -293,7 +293,7 @@ (define (intern tarball)
(propagated-inputs
`(("gnutls" ,gnutls)
("guile-gcrypt" ,guile-gcrypt)
("guile-json" ,guile-json)
("guile-json" ,guile-json-1)
("guile-sqlite3" ,guile-sqlite3)
("guile-ssh" ,guile-ssh)
("guile-git" ,guile-git)))
@ -325,7 +325,7 @@ (define-public guix-daemon
(inputs
`(("gnutls" ,gnutls)
("guile-git" ,guile-git)
("guile-json" ,guile-json)
("guile-json" ,guile-json-1)
("guile-gcrypt" ,guile-gcrypt)
,@(fold alist-delete (package-inputs guix)
'("boot-guile" "boot-guile/i686" "util-linux"))))

2
gnu/packages/web.scm
View file

@ -6509,7 +6509,7 @@ (define-public hpcguix-web
(propagated-inputs
`(("guile" ,guile-2.2)
("guile-commonmark" ,guile-commonmark)
("guile-json" ,guile-json)))
("guile-json" ,guile-json-1)))
(home-page "https://github.com/UMCUGenetics/hpcguix-web")
(synopsis "Web interface for cluster deployments of Guix")
(description "Hpcguix-web provides a web interface to the list of packages