~ruther/guix-local

bdf1022decbc2ea4e998c74af7ce75e17e5ec485 — Ludovic Courtès 9 years ago bd19f65
gnu: guile-reader: Default to Guile 2.2.

* gnu/packages/guile.scm (guile-reader)[inputs]: Change GUILE-2.0 to
GUILE-2.2.
(guile2.0-reader): New variable.
(guile2.2-reader): Mark as deprecated.
(haunt)[propagated-inputs]: Use GUILE-READER instead of
GUILE2.2-READER.
2 files changed, 7 insertions(+), 5 deletions(-)

M gnu/packages/guile.scm
M gnu/packages/skribilo.scm
M gnu/packages/guile.scm => gnu/packages/guile.scm +5 -3
@@ 456,7 456,7 @@ more.")
    (build-system gnu-build-system)
    (native-inputs `(("pkgconfig" ,pkg-config)
                     ("gperf" ,gperf)))
    (inputs `(("guile" ,guile-2.0)))
    (inputs `(("guile" ,guile-2.2)))
    (synopsis "Framework for building readers for GNU Guile")
    (description
     "Guile-Reader is a simple framework for building readers for GNU Guile.


@@ 473,8 473,10 @@ many readers as needed).")
    (home-page "http://www.nongnu.org/guile-reader/")
    (license license:gpl3+)))

(define-public guile2.0-reader
  (package-for-guile-2.0 guile-reader))
(define-public guile2.2-reader
  (package-for-guile-2.2 guile-reader))
  (deprecated-package "guile2.2-reader" guile-reader))

(define-public guile-ncurses
  (package


@@ 1059,7 1061,7 @@ Guile's foreign function interface.")
    (inputs
     `(("guile" ,guile-2.2)))
    (propagated-inputs
     `(("guile-reader" ,guile2.2-reader)
     `(("guile-reader" ,guile-reader)
       ("guile-commonmark" ,guile2.2-commonmark)))
    (synopsis "Functional static site generator")
    (description "Haunt is a static site generator written in Guile

M gnu/packages/skribilo.scm => gnu/packages/skribilo.scm +2 -2
@@ 1,5 1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;


@@ 73,7 73,7 @@

    ;; The 'skribilo' command needs them, and for people using Skribilo as a
    ;; library, these inputs are needed as well.
    (propagated-inputs `(("guile-reader" ,guile-reader)
    (propagated-inputs `(("guile-reader" ,guile2.0-reader)
                         ("guile-lib" ,guile-lib)))

    (home-page "http://www.nongnu.org/skribilo/")