[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/03: gnu: Explicitly refer to 'guile-json-1' when needed.
From: |
guix-commits |
Subject: |
03/03: gnu: Explicitly refer to 'guile-json-1' when needed. |
Date: |
Wed, 24 Jul 2019 18:37:26 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 91f55717abd05a5808eb6b3a0b397bee4e8edd09
Author: Ludovic Courtès <address@hidden>
Date: Sun Jul 21 23:19:58 2019 +0200
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.
---
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/ci.scm | 2 +-
gnu/packages/guile-xyz.scm | 6 +++---
gnu/packages/mail.scm | 4 ++--
gnu/packages/package-management.scm | 4 ++--
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 5412440..89f1ac3 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 eb5f665..4af2cdc 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 c16342d..6dcdced 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 b555578..8a3f64b 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
<address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<address@hidden>
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <address@hidden>
;;; Copyright © 2014 Ian Denhardt <address@hidden>
;;; Copyright © 2014 Sou Bunnbu <address@hidden>
@@ -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 ab11065..9b2cce0 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 f81d12c..ac64032 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