From 291c2d57e8fd15e09ba8c753718efe48b3077389 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 30 Apr 2018 19:31:52 +0200
Subject: gnu: guile-ics: Update to 0.2.0.

* gnu/packages/guile.scm (guile-ics): Update to 0.2.0.
---
 gnu/packages/guile.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/guile.scm')

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 2af6f875e9..dd21a88ac1 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -720,16 +720,16 @@ (define-public mcron2
 (define-public guile-ics
   (package
     (name "guile-ics")
-    (version "0.1.1")
+    (version "0.2.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/artyom-poptsov/guile-ics")
-                    (commit "v0.1.1")))
+                    (commit (string-append "v" version))))
               (file-name (string-append name "-" version "-checkout"))
               (sha256
                (base32
-                "1pvg6j48inpbq47hq00yh5hhl2qd2srvrx5yjl7w7ky1jsjadp86"))))
+                "0qjjvadr7gibdq9jvwkmlkb4afsw9n2shfj9phpiadinxk3p4m2g"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
-- 
cgit v1.2.3


From d573d8926def81df5a42e232099534cda4a39739 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 30 Apr 2018 19:32:13 +0200
Subject: gnu: guile-ics: Switch to Guile 2.2.

* gnu/packages/guile.scm (guile-ics)[inputs]: Switch to GUILE-2.2.
[propagated-inputs]: Switch to GUILE-LIB.
---
 gnu/packages/guile.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/guile.scm')

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index dd21a88ac1..fd6dd60026 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -746,8 +746,8 @@ (define-public guile-ics
        ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'.
        ("gettext" ,gettext-minimal)
        ("pkg-config" ,pkg-config)))
-    (inputs `(("guile" ,guile-2.0) ("which" ,which)))
-    (propagated-inputs `(("guile-lib" ,guile2.0-lib)))
+    (inputs `(("guile" ,guile-2.2) ("which" ,which)))
+    (propagated-inputs `(("guile-lib" ,guile-lib)))
     (home-page "https://github.com/artyom-poptsov/guile-ics")
     (synopsis "Guile parser library for the iCalendar format")
     (description
-- 
cgit v1.2.3


From d58ee08dffe99b8fb0523cf2eeec1f337cccfb88 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 30 Apr 2018 19:34:04 +0200
Subject: gnu: guile-minikanren: Switch to Guile 2.2.

* gnu/packages/guile.scm (guile-minikanren)[inputs]: Switch to
GUILE-2.2.
(guile2.0-minikanren): New variable.
(guile2.2-minikanren): Define in terms of 'deprecated-package'.
---
 gnu/packages/guile.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/guile.scm')

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index fd6dd60026..a0d131b9ca 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -916,7 +916,7 @@ (define-public guile-minikanren
            (install-file "README.org" doc)
            #t))))
     (inputs
-     `(("guile" ,guile-2.0)))
+     `(("guile" ,guile-2.2)))
     (home-page "https://github.com/ijp/minikanren")
     (synopsis "MiniKanren declarative logic system, packaged for Guile")
     (description
@@ -931,8 +931,11 @@ (define-public guile-minikanren
 See http://minikanren.org/ for more on miniKanren generally.")
     (license license:expat)))
 
+(define-public guile2.0-minikanren
+  (package-for-guile-2.0 guile-minikanren))
+
 (define-public guile2.2-minikanren
-  (package-for-guile-2.2 guile-minikanren))
+  (deprecated-package "guile2.2-minikanren" guile-minikanren))
 
 (define-public guile-miniadapton
   (let ((commit "1b5749422304567c96ac5367f2221dda9eff5880")
-- 
cgit v1.2.3


From 2863860b6ccee4761342eb15fe826938239b942c Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 30 Apr 2018 21:52:31 +0200
Subject: gnu: guile-irregex: Switch to Guile 2.2.

* gnu/packages/guile.scm (guile-irregex)[inputs]: Switch to
GUILE-2.2.
(guile2.0-irregex): New variable.
(guile2.2-irregex): Define in terms of 'deprecated-package'.
---
 gnu/packages/guile.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/guile.scm')

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index a0d131b9ca..770f7b6d43 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1078,7 +1078,7 @@ (define-public guile-irregex
                (install-file "irregex.html" doc)
                #t))))))
     (inputs
-     `(("guile" ,guile-2.0)))
+     `(("guile" ,guile-2.2)))
     (home-page "http://synthcode.com/scheme/irregex")
     (synopsis "S-expression based regular expressions")
     (description
@@ -1087,8 +1087,11 @@ (define-public guile-irregex
 inspired by the SCSH regular expression system.")
     (license license:bsd-3)))
 
+(define-public guile2.0-irregex
+  (package-for-guile-2.0 guile-irregex))
+
 (define-public guile2.2-irregex
-  (package-for-guile-2.2 guile-irregex))
+  (deprecated-package "guile2.2-irregex" guile-irregex))
 
 ;; There are two guile-gdbm packages, one using the FFI and one with
 ;; direct C bindings, hence the verbose name.
-- 
cgit v1.2.3


From d5eacecc9f39be1f9082ccfef0bf140aa73b0ee4 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 30 Apr 2018 21:54:22 +0200
Subject: gnu: guile-redis: Switch to Guile 2.2.

* gnu/packages/guile.scm (guile-redis)[inputs]: Switch to
GUILE-2.2.
(guile2.0-redis): New variable.
(guile2.2-redis): Define in terms of 'deprecated-package'.
---
 gnu/packages/guile.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/guile.scm')

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 770f7b6d43..181060c957 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1355,15 +1355,18 @@ (define-public guile-redis
                      (string-append all "/@GUILE_EFFECTIVE_VERSION@")))))))
     (build-system gnu-build-system)
     (native-inputs
-     `(("guile" ,guile-2.0)))
+     `(("guile" ,guile-2.2)))
     (home-page "https://savannah.nongnu.org/projects/guile-redis/")
     (synopsis "Redis client library for Guile")
     (description "Guile-redis provides a Scheme interface to the Redis
 key-value cache and store.")
     (license license:lgpl3+)))
 
+(define-public guile2.0-redis
+  (package-for-guile-2.0 guile-redis))
+
 (define-public guile2.2-redis
-  (package-for-guile-2.2 guile-redis))
+  (deprecated-package "guile2.2-redis" guile-redis))
 
 (define-public guile-wisp
   (package
-- 
cgit v1.2.3


From b989c3e3760793bf9cb79461b3d03f566e0facc9 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 30 Apr 2018 21:59:53 +0200
Subject: gnu: guile-dbi: Switch to Guile 2.2.

* gnu/packages/guile.scm (guile-dbi)[inputs]: Switch to GUILE-2.2.
[arguments]: Adjust to use "/2.2".
---
 gnu/packages/guile.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/guile.scm')

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 181060c957..38076081b3 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1548,19 +1548,19 @@ (define-public guile-dbi
     (arguments
      '(#:configure-flags
        (list (string-append
-              "--with-guile-site-dir=" %output "/share/guile/site/2.0"))
+              "--with-guile-site-dir=" %output "/share/guile/site/2.2"))
        #:phases
        (modify-phases %standard-phases
          (add-after 'install 'patch-extension-path
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out     (assoc-ref outputs "out"))
                     (dbi.scm (string-append
-                              out "/share/guile/site/2.0/dbi/dbi.scm"))
+                              out "/share/guile/site/2.2/dbi/dbi.scm"))
                     (ext     (string-append out "/lib/libguile-dbi")))
                (substitute* dbi.scm (("libguile-dbi") ext))
                #t))))))
     (propagated-inputs
-     `(("guile" ,guile-2.0)))
+     `(("guile" ,guile-2.2)))
     (synopsis "Guile database abstraction layer")
     (home-page "http://home.gna.org/guile-dbi/guile-dbi.html")
     (description
-- 
cgit v1.2.3