diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-05-13 21:49:01 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-05-13 22:25:22 +0200 |
| commit | 2252f087d4bd450ab41a71379320467887edfc0f (patch) | |
| tree | 256060084dda7dc5c82316c3fe6f21206077ab9a /gnu | |
| parent | a76ca052d6e772164586bb1b4b2b8c69af783666 (diff) | |
| download | guix-2252f087d4bd450ab41a71379320467887edfc0f.tar.gz | |
gnu: guile-json: Rename "guile2.2-json" to "guile-json".
* gnu/packages/guile.scm (guile-json)[native-inputs]: Change GUILE-2.0 to GUILE-2.2. (guile2.2-json): Define using 'deprecated-package'. (guile2.0-json): New variable. * gnu/packages/bioinformatics.scm (rcas-web)[inputs]: Update accordingly. * gnu/packages/ci.scm (cuirass)[inputs]: Likewise. * gnu/packages/package-management.scm (guix)[inputs]: Likewise.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/bioinformatics.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/ci.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/guile.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/package-management.scm | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 6ef8690e48..9f5d8141d8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -7891,7 +7891,7 @@ library implementing most of the pipeline's features.") `(("r-minimal" ,r-minimal) ("r-rcas" ,r-rcas) ("guile-next" ,guile-2.2) - ("guile-json" ,guile2.2-json) + ("guile-json" ,guile-json) ("guile-redis" ,guile2.2-redis))) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 06a06dc65c..c26d02f175 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -247,7 +247,7 @@ their dependencies.") #t)))))) (inputs `(("guile" ,guile-2.2) - ("guile-json" ,guile2.2-json) + ("guile-json" ,guile-json) ("guile-sqlite3" ,guile-sqlite3) ("guix" ,guix) ("git" ,git))) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 286aa42e7d..5b85a61c12 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -691,7 +691,7 @@ for Guile\".") (("moddir =.*/share/guile/site" all) (string-append all "/@GUILE_EFFECTIVE_VERSION@"))))))) (build-system gnu-build-system) - (native-inputs `(("guile" ,guile-2.0))) + (native-inputs `(("guile" ,guile-2.2))) (home-page "http://savannah.nongnu.org/projects/guile-json/") (synopsis "JSON module for Guile") (description @@ -707,7 +707,10 @@ specification. These are the main features: (license license:lgpl3+))) (define-public guile2.2-json - (package-for-guile-2.2 guile-json)) + (deprecated-package "guile2.2-json" guile-json)) + +(define-public guile2.0-json + (package-for-guile-2.0 guile-json)) (define-public guile-minikanren (package diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 627501e9b1..3e0449a853 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -248,7 +248,7 @@ "1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r")))))) (propagated-inputs `(("gnutls" ,gnutls/guile-2.2) ;for 'guix download' & co. - ("guile-json" ,guile2.2-json) + ("guile-json" ,guile-json) ("guile-ssh" ,guile2.2-ssh))) (home-page "https://www.gnu.org/software/guix/") |