Merge remote-tracking branch 'origin/master' into kde-updates

3 files changed, 37 insertions, 2 deletions

diff --git a/tests/guix-refresh.sh b/tests/guix-refresh.sh
index 51d34c4b51..2ce3c592ab 100644
--- a/tests/guix-refresh.sh
+++ b/tests/guix-refresh.sh
@@ -109,6 +109,13 @@ case "$(guix refresh -t test guile=2.0.0 2>&1)" in
     *"failed to find"*"2.0.0"*) true;;
     *) false;;
 esac
+
+guix refresh -t test guile --target-version=2.0.0 # XXX: should return non-zero?
+case "$(guix refresh -t test guile --target-version=2.0.0 2>&1)" in
+    *"failed to find"*"2.0.0"*) true;;
+    *) false;;
+esac
+
 for spec in "guile=1.6.4" "guile@3=1.6.4"
 do
     guix refresh -t test "$spec"
diff --git a/tests/guix-time-machine.sh b/tests/guix-time-machine.sh
new file mode 100644
index 0000000000..8b62ef75ea
--- /dev/null
+++ b/tests/guix-time-machine.sh
@@ -0,0 +1,28 @@
+# GNU Guix --- Functional package management for GNU
+# Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+#
+# This file is part of GNU Guix.
+#
+# GNU Guix is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Guix is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Test the 'guix time-machine' command-line utility.
+#
+
+guix time-machine --version
+
+# Visiting a commit older than v1.0.0 fails.
+! guix time-machine --commit=v0.15.0
+
+exit 0
diff --git a/tests/texlive.scm b/tests/texlive.scm
index 98461f7e51..fac9faf714 100644
--- a/tests/texlive.scm
+++ b/tests/texlive.scm
@@ -542,12 +542,12 @@ completely compatible with Plain TeX.")
                ('arguments
                 ('list '#:builder ('gexp ('mkdir ('ungexp 'output)))))
                ('propagated-inputs
-                ('list 'texlive-collection-basic 'texlive-texworks))
+                ('list 'texlive-collection-basic))
                ('home-page "https://www.tug.org/texlive/")
                ('synopsis (? string?))
                ('description (? string?))
                ('license
-                ('license:fsf-free "https://www.tug.org/texlive/copying.html")))
+                ('fsf-free "https://www.tug.org/texlive/copying.html")))
              #true)
             (_
              (begin