diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-07-21 23:19:58 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-07-25 00:18:45 +0200 |
commit | 91f55717abd05a5808eb6b3a0b397bee4e8edd09 (patch) | |
tree | 20fff38777de2c3cef4d97934b6f7318b15a68d1 | |
parent | 584a3ca3a4fb69bcf4d166b426ddb882e434894f (diff) | |
download | patches-91f55717abd05a5808eb6b3a0b397bee4e8edd09.tar patches-91f55717abd05a5808eb6b3a0b397bee4e8edd09.tar.gz |
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.
-rw-r--r-- | gnu/packages/bioinformatics.scm | 2 | ||||
-rw-r--r-- | gnu/packages/ci.scm | 2 | ||||
-rw-r--r-- | gnu/packages/guile-xyz.scm | 6 | ||||
-rw-r--r-- | gnu/packages/mail.scm | 4 | ||||
-rw-r--r-- | gnu/packages/package-management.scm | 4 | ||||
-rw-r--r-- | gnu/packages/web.scm | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 5412440fb1..89f1ac36ea 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -8427,7 +8427,7 @@ library implementing most of the pipeline's features.") `(("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))) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index eb5f665fc1..4af2cdc6ea 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -121,7 +121,7 @@ `(("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 diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index c16342deb0..6dcdcedccf 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -146,7 +146,7 @@ ;; 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 @@ messaging library.") (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 @@ Scheme by using Guile’s foreign function interface.") (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 diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b555578639..8a3f64b10d 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -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 @@ replacement for the @code{urlview} program.") `(("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 diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index ab11065379..9b2cce0e8f 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -293,7 +293,7 @@ (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 @@ the Nix package manager.") (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")))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f81d12c7ce..ac6403211c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6509,7 +6509,7 @@ compressed JSON header blocks. (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 |