~ruther/guix-local

2252f087d4bd450ab41a71379320467887edfc0f — Ludovic Courtès 9 years ago a76ca05
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.
M gnu/packages/bioinformatics.scm => gnu/packages/bioinformatics.scm +1 -1
@@ 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)))

M gnu/packages/ci.scm => gnu/packages/ci.scm +1 -1
@@ 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)))

M gnu/packages/guile.scm => gnu/packages/guile.scm +5 -2
@@ 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

M gnu/packages/package-management.scm => gnu/packages/package-management.scm +1 -1
@@ 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/")