README

@@ -77,7 +77,7 @@ scheme@(guile-user)> ,use(xosd)
 * Building/installing with Guix
 
 The latest version of Guile-XOSD can be installed with [[http://www.gnu.org/software/guix/][GNU Guix]]:
-https://www.gnu.org/software/guix/packages/#guile-xosd.
+[[https://guix.gnu.org/en/packages/guile-xosd-0.2.2]].
 
 Also this repository contains [[file:guix.scm]] file which can be used to
 build/install Guile-XOSD using the git checkout, or to make a

configure.ac

@@ -1,5 +1,5 @@
 define(GUILE_XOSD_CONFIGURE_COPYRIGHT, [[
-Copyright (C) 2016 Alex Kost <alezost@gmail.com>
+Copyright (C) 2016, 2021 Alex Kost <alezost@gmail.com>
 
 This file is part of Guile-XOSD.
 
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with Guile-XOSD.  If not, see <http://www.gnu.org/licenses/>.
 ]])
 
-AC_INIT([Guile-XOSD], [0.2.1], [alezost@gmail.com], [guile-xosd],
+AC_INIT([Guile-XOSD], [0.2.2], [alezost@gmail.com], [guile-xosd],
         [https://github.com/alezost/guile-xosd])
 
 AC_COPYRIGHT(GUILE_XOSD_CONFIGURE_COPYRIGHT)
@@ -35,22 +35,8 @@ AC_SUBST([LIBRARY_NAME])
 dnl ----------------------------------------------------------------
 dnl Checking for Guile
 
-guile_version=no
-supported_versions="2.2 2.0"
-for version in $supported_versions; do
-  if test $guile_version = no; then
-    AC_MSG_NOTICE([checking for Guile $version])
-    PKG_CHECK_MODULES(GUILE, guile-$version, [guile_version=$version], [true])
-  fi
-done
-
-if test $guile_version = no; then
-  AC_MSG_ERROR([failed to find supported Guile version])
-else
-  AC_MSG_NOTICE([found Guile $guile_version])
-fi
-
-GUILE_PROGS
+GUILE_PKG([3.0 2.2 2.0])
+GUILE_PROGS([2.0.2])
 
 AC_ARG_WITH([guile-site-dir],
   [AS_HELP_STRING([--with-guile-site-dir],

guix.scm

@@ -1,6 +1,6 @@
 ;;; guix.scm --- Guix package for Guile-XOSD
 
-;; Copyright © 2016–2017 Alex Kost <alezost@gmail.com>
+;; Copyright © 2016–2017, 2021 Alex Kost <alezost@gmail.com>
 
 ;; This file is part of Guile-XOSD.
 
@@ -59,7 +59,7 @@ newspace."
   (with-directory-excursion %source-dir
     (let* ((port   (apply open-pipe* OPEN_READ "git" args))
            (output (read-string port)))
-      (close-port port)
+      (close-pipe port)
       (string-trim-right output #\newline))))
 
 (define (git-files)