gnu: ant/java8: Rename to ant.

* gnu/packages/java.scm (ant): Rename to...
(ant/java7): ...this.
(ant/java8): Rename to...
(ant): ...this.
(java-qdox-1.12, java-jarjar, java-hamcrest-core, java-hamcrest-parent-pom)
(java-junit, java-org-ow2-parent-pom-1.3, java-asm-bootstrap): Rename
inputs accordingly.
* gnu/packages/axoloti.scm: Rename accordingly.
* gnu/packages/bioinformatics.scm: idem.
* gnu/packages/groovy.scm: idem.
* gnu/packages/java-maths.scm: idem.
* guix/build-system/ant.scm: idem.

Change-Id: I9d79ce8e351862747420fc2a58301b7f61212293

gnu/packages/audio.scm

@@ -396,7 +396,6 @@ displays a histogram of the roundtrip time jitter.")
                                   "webrtc-audio-processing-x86-no-sse.patch"))))))
                #~%standard-phases)))
     (native-inputs (list pkg-config))
-    (propagated-inputs (list abseil-cpp))
     (inputs (list abseil-cpp))
     (synopsis "WebRTC's Audio Processing Library")
     (description "WebRTC-Audio-Processing library based on Google's
@@ -547,17 +546,15 @@ synth (like DX7) or FM chip.")
 (define-public libgme
   (package
     (name "libgme")
-    (version "0.6.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri
-        (git-reference
-         (url "https://github.com/libgme/game-music-emu")
-         (commit version)))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "093pz3avnj6a230bqbwwzqlzcjxnxidfxipnn7zirwp3h396szff"))))
+    (version "0.6.3")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://bitbucket.org/mpyne/game-music-emu/"
+                                  "downloads/game-music-emu-" version
+                                  ".tar.xz"))
+              (sha256
+               (base32
+                "07857vdkak306d9s5g6fhmjyxk7vijzjhkmqb15s7ihfxx9lx8xb"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f                                ;no check target
@@ -566,7 +563,7 @@ synth (like DX7) or FM chip.")
        ;; header file names in libgme.so, meaning that libgme retains a
        ;; reference to GCC.  Disable UBSAN to avoid that.
        #:configure-flags '("-DENABLE_UBSAN=OFF")))
-    (home-page "https://github.com/libgme/game-music-emu/wiki")
+    (home-page "https://bitbucket.org/mpyne/game-music-emu")
     (synopsis "Video game music file playback library")
     (description
      "Game-music-emu is a collection of video game music file emulators that

gnu/packages/axoloti.scm

@@ -341,7 +341,7 @@ runtime.")
        ("java-jgit" ,java-jgit-4.2)
        ("axoloti-runtime" ,axoloti-runtime)))
     (native-inputs
-     (list ant zip ; for repacking the jar
+     (list ant/java7 zip ; for repacking the jar
            unzip))
     (description
      "The Axoloti patcher offers a “patcher” environment similar to Pure Data
@@ -647,7 +647,7 @@ This package provides the runtime.")
        ("java-slf4j-api" ,java-slf4j-api)
        ("ksoloti-runtime" ,ksoloti-runtime)))
     (native-inputs
-     (list ant zip                      ;for repacking the jar
+     (list ant/java7 zip                      ;for repacking the jar
            unzip))
     (description
      "Ksoloti is an environment for generating and processing digital audio.

gnu/packages/bioinformatics.scm

@@ -9283,7 +9283,7 @@ VCF.")
        ;; [testng] Exception in thread "main" java.lang.NoClassDefFoundError: com/beust/jcommander/ParameterException
        #:tests? #f
        #:jdk ,icedtea-8
-       #:ant ,ant/java8
+       #:ant ,ant
        ;; This is only used for tests.
        #:make-flags
        (list "-Dsamjdk.intel_deflater_so_path=lib/jni/libIntelDeflater.so")
@@ -9353,11 +9353,10 @@ VCF.")
      (list java-snappy-1
            java-commons-jexl-2
            java-cofoja
-           ant/java8                    ;for bzip2 support at runtime
+           ant                          ;for bzip2 support at runtime
            zlib))
     (native-inputs
      `(("ant-apache-bcel" ,ant-apache-bcel)
-       ("ant-junit" ,ant-junit)
        ("java-testng" ,java-testng)
        ("java-commons-bcel" ,java-commons-bcel)
        ("java-jcommander" ,java-jcommander)

gnu/packages/groovy.scm

@@ -412,7 +412,7 @@ similar to javadoc."))))
       (inherit base)
       (arguments
        `(;#:tests? #f;Requires spock-framework which is a circular dependency
-         #:ant ,ant/java8; ant is actually a dependency of this package, and we need 1.10
+         #:ant ,ant; ant is actually a dependency of this package, and we need 1.10
          ,@(substitute-keyword-arguments arguments
              ((#:phases phases)
               `(modify-phases ,phases
@@ -431,8 +431,7 @@ similar to javadoc."))))
          ("java-asm-analysis" ,java-asm-analysis-8)
          ,@(package-inputs base)))
       (native-inputs
-       `(("ant-junit" ,ant-junit)
-         ("groovy-bootstrap" ,groovy-bootstrap)
+       `(("groovy-bootstrap" ,groovy-bootstrap)
          ("groovy-xml" ,groovy-xml)
          ("groovy-test" ,groovy-test)
          ("groovy-tests-bootstrap" ,groovy-tests-bootstrap)

gnu/packages/java-maths.scm

@@ -75,7 +75,7 @@
     (inputs
      (list openblas))
     (native-inputs
-     `(("ant" ,ant)
+     `(("ant" ,ant/java7)
        ("ruby" ,ruby)                   ; for configure script
        ("gfortran" ,gfortran)
        ("jdk" ,icedtea "jdk")))

gnu/packages/java.scm

@@ -1964,8 +1964,7 @@ OpenJDK.")
     (home-page "https://www.jetbrains.com/")
     (license license:gpl2+)))
 
-
-(define-public ant/java8
+(define-public ant
   (package
     (name "ant")
     (version "1.10.15")
@@ -1980,15 +1979,12 @@ OpenJDK.")
               (snippet
                '(begin
                   (for-each delete-file
-                            (find-files "lib/optional" "\\.jar$"))
-                  #t))))
-    (build-system gnu-build-system)
+                            (find-files "lib/optional" "\\.jar$"))))))
+    (build-system ant-build-system)
     (arguments
      (list
-      #:modules '((srfi srfi-1)
-                  (guix build gnu-build-system)
-                  (guix build utils))
-      #:tests? #f                       ;no "check" target
+      #:ant ant/java7
+      #:test-target "test"
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'remove-scripts
@@ -1998,11 +1994,100 @@ OpenJDK.")
               (for-each delete-file
                         (find-files "src/script"
                                     "(.*\\.(bat|cmd)|runant.*|antRun.*)"))))
+          (add-after 'unpack 'link-test-dependencies
+            (lambda* (#:key inputs #:allow-other-keys)
+              (for-each (lambda (file)
+                          (symlink file
+                                   (string-append "lib/optional/"
+                                                  (basename file))))
+                        (append
+                          (find-files (assoc-ref inputs "java-hamcrest-core")
+                                      "\\.jar$")
+                          (find-files (assoc-ref inputs "java-hamcrest-library")
+                                      "\\.jar$")
+                          (find-files (assoc-ref inputs "java-junit")
+                                      "\\.jar$")))))
+          (add-before 'build 'fix-test-failures
+            (lambda _
+              ;; Failure because the directory does not exist
+              (substitute* "src/etc/testcases/taskdefs/exec/exec-with-redirector.xml"
+                (("/usr/bin") (getcwd)))
+              ;; Failure because it cannot read root's name in the build
+              ;; container
+              (delete-file "src/tests/junit/org/apache/tools/ant/types/selectors/OwnedBySelectorTest.java")
+              ;; Cause timestamp issue when trying to rollback time by a few
+              ;; seconds.
+              (for-each (lambda (file) (utime file 5000))
+                        (find-files "src/etc/testcases/taskdefs" "" #:directories? #t))))
           (delete 'bootstrap)
           (delete 'configure)
           (replace 'build
             (lambda* (#:key inputs #:allow-other-keys)
               (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
+              (invoke "bash" "bootstrap.sh"
+                      (string-append "-Ddist.dir=" #$output))))
+          (add-after 'build 'fix-executables-paths
+            (lambda* (#:key inputs #:allow-other-keys)
+              (wrap-script (string-append #$output "/bin/ant")
+                `("PATH" suffix
+                  (,(dirname (search-input-file inputs "/bin/sed"))
+                   ,(dirname (search-input-file inputs "/bin/uname"))
+                   ,(dirname (search-input-file inputs "/bin/which")))))
+              (patch-shebang
+               (string-append #$output "/bin/complete-ant-cmd.pl")
+               (list (dirname (search-input-file inputs "/bin/perl"))))))
+          (delete 'install))))
+    (inputs
+     (list coreutils-minimal
+           guile-3.0/pinned
+           java-hamcrest-core
+           java-hamcrest-library
+           java-junit
+           perl
+           sed
+           which))
+    (home-page "https://ant.apache.org")
+    (synopsis "Build tool for Java")
+    (description
+     "Ant is a platform-independent build tool for Java.  It is similar to
+make but is implemented using the Java language, requires the Java platform,
+and is best suited to building Java projects.  Ant uses XML to describe the
+build process and its dependencies, whereas Make uses Makefile format.")
+    (license license:asl2.0)))
+
+;; The 1.9.x series is the last that can be built with GCJ.  The 1.10.x series
+;; requires Java 8.
+(define-public ant/java7
+  (package
+    (name "ant")
+    (version "1.9.15")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://apache/ant/source/apache-ant-"
+                                  version "-src.tar.gz"))
+              (sha256
+               (base32
+                "1xy30f1w5gaqk6g3f0vw7ygix4rb6032qkcw42y4z8wd9jihgygd"))))
+    (build-system gnu-build-system)
+    (arguments
+      `(#:modules ((srfi srfi-1)
+                   (guix build gnu-build-system)
+                   (guix build utils))
+        #:tests? #f                  ; no "check" target
+        #:phases
+        (modify-phases %standard-phases
+          (delete 'bootstrap)
+          (delete 'configure)
+          (add-after 'unpack 'remove-scripts
+            ;; Remove bat / cmd scripts for DOS as well as the antRun and runant
+            ;; wrappers.
+            (lambda _
+              (for-each delete-file
+                        (find-files "src/script"
+                                    "(.*\\.(bat|cmd)|runant.*|antRun.*)"))))
+          (replace 'build
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
 
               ;; Disable tests to avoid dependency on hamcrest-core, which needs
               ;; Ant to build.  This is necessary in addition to disabling the
@@ -2011,9 +2096,10 @@ OpenJDK.")
               (substitute* "build.xml"
                 (("depends=\"jars,test-jar") "depends=\"jars"))
               (invoke "bash" "bootstrap.sh"
-                      (string-append "-Ddist.dir=" #$output))))
+                      (string-append "-Ddist.dir="
+                                     (assoc-ref outputs "out")))))
           (add-after 'build 'strip-jar-timestamps ;based on ant-build-system
-            (lambda _
+            (lambda* (#:key outputs #:allow-other-keys)
               (define (repack-archive jar)
                 (let* ((dir (mkdtemp "jar-contents.XXXXXX"))
                        (manifest (string-append dir "/META-INF/MANIFESTS.MF")))
@@ -2039,11 +2125,11 @@ OpenJDK.")
                       (apply invoke command)))))
               (for-each repack-archive
                         (find-files
-                         (string-append #$output "/lib")
+                         (string-append (assoc-ref %outputs "out") "/lib")
                          "\\.jar$"))))
           (delete 'install))))
     (native-inputs
-     `(("jdk" ,icedtea-8 "jdk")
+     `(("jdk" ,icedtea-7 "jdk")
        ("zip" ,zip)
        ("unzip" ,unzip)))
     (home-page "https://ant.apache.org")
@@ -2055,131 +2141,12 @@ and is best suited to building Java projects.  Ant uses XML to describe the
 build process and its dependencies, whereas Make uses Makefile format.")
     (license license:asl2.0)))
 
-;; The 1.9.x series is the last that can be built with GCJ.  The 1.10.x series
-;; requires Java 8.
-(define-public ant
-  (package (inherit ant/java8)
-    (version "1.9.15")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://apache/ant/source/apache-ant-"
-                                  version "-src.tar.gz"))
-              (sha256
-               (base32
-                "1xy30f1w5gaqk6g3f0vw7ygix4rb6032qkcw42y4z8wd9jihgygd"))))
-    ;; XXX: we do this to avoid a rebuild.  This mess will be cleaned up
-    ;; later.
-    (arguments
-     (substitute-keyword-arguments
-         `(#:modules ((srfi srfi-1)
-                      (guix build gnu-build-system)
-                      (guix build utils))
-           #:tests? #f                  ; no "check" target
-           #:phases
-           (modify-phases %standard-phases
-             (delete 'bootstrap)
-             (delete 'configure)
-             (add-before 'build 'define-java-environment-variables
-               (lambda* (#:key inputs #:allow-other-keys)
-                 ;; First, set environment variables (eases debugging on -K).
-                 (setenv "JAVA_HOME" (assoc-ref inputs "jamvm"))
-                 (setenv "JAVACMD" (search-input-file inputs "/bin/jamvm"))
-                 (setenv "JAVAC" (search-input-file inputs "/bin/jikes"))
-                 (setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar"))))
-             (replace 'build
-               (lambda* (#:key inputs outputs #:allow-other-keys)
-                 ;; Ant complains if this file doesn't exist.
-                 (setenv "HOME" "/tmp")
-                 (with-output-to-file "/tmp/.ant.properties"
-                   (lambda _ (display "")))
-
-                 ;; Use jikes instead of javac for <javac ...> tags in build.xml
-                 (setenv "ANT_OPTS" "-Dbuild.compiler=jikes")
-
-                 ;; jikes produces lots of warnings, but they are not very
-                 ;; interesting, so we silence them.
-                 (setenv "$BOOTJAVAC_OPTS" "-nowarn")
-
-                 ;; Without these JamVM options the build may freeze.
-                 (substitute* "bootstrap.sh"
-                   (("^\"\\$\\{JAVACMD\\}\" " m)
-                    ,@(if (string-prefix? "armhf" (or (%current-system)
-                                                      (%current-target-system)))
-                          `((string-append m "-Xnocompact "))
-                          `((string-append m "-Xnocompact -Xnoinlining ")))))
-
-                 ;; Disable tests because we are bootstrapping and thus don't have
-                 ;; any of the dependencies required to build and run the tests.
-                 (substitute* "build.xml"
-                   (("depends=\"jars,test-jar\"") "depends=\"jars\""))
-                 (invoke "bash" "bootstrap.sh"
-                         (string-append "-Ddist.dir="
-                                        (assoc-ref outputs "out")))))
-             (add-after 'build 'strip-jar-timestamps ;based on ant-build-system
-               (lambda* (#:key outputs #:allow-other-keys)
-                 (define (repack-archive jar)
-                   (let* ((dir (mkdtemp "jar-contents.XXXXXX"))
-                          (manifest (string-append dir "/META-INF/MANIFESTS.MF")))
-                     (with-directory-excursion dir
-                       (invoke "unzip" jar))
-                     (delete-file jar)
-                     ;; XXX: copied from (gnu build install)
-                     (for-each (lambda (file)
-                                 (let ((s (lstat file)))
-                                   (unless (eq? (stat:type s) 'symlink)
-                                     (utime file  0 0 0 0))))
-                               (find-files dir #:directories? #t))
-                     ;; It is important that the manifest appears first.
-                     (with-directory-excursion dir
-                       (let* ((files (find-files "." ".*" #:directories? #t))
-                              ;; To ensure that the reference scanner can
-                              ;; detect all store references in the jars
-                              ;; we disable compression with the "-0" option.
-                              (command (if (file-exists? manifest)
-                                           `("zip" "-0" "-X" ,jar ,manifest
-                                             ,@files)
-                                           `("zip" "-0" "-X" ,jar ,@files))))
-                         (apply invoke command)))))
-                 (for-each repack-archive
-                           (find-files
-                            (string-append (assoc-ref %outputs "out") "/lib")
-                            "\\.jar$"))))
-             (delete 'install)))
-       ((#:phases phases)
-        `(modify-phases ,phases
-           (delete 'define-java-environment-variables)
-           (add-after 'unpack 'remove-scripts
-             ;; Remove bat / cmd scripts for DOS as well as the antRun and runant
-             ;; wrappers.
-             (lambda _
-               (for-each delete-file
-                         (find-files "src/script"
-                                     "(.*\\.(bat|cmd)|runant.*|antRun.*)"))
-               #t))
-           (replace 'build
-             (lambda* (#:key inputs outputs #:allow-other-keys)
-               (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
-
-               ;; Disable tests to avoid dependency on hamcrest-core, which needs
-               ;; Ant to build.  This is necessary in addition to disabling the
-               ;; "check" phase, because the dependency on "test-jar" would always
-               ;; result in the tests to be run.
-               (substitute* "build.xml"
-                 (("depends=\"jars,test-jar") "depends=\"jars"))
-               (invoke "bash" "bootstrap.sh"
-                       (string-append "-Ddist.dir="
-                                      (assoc-ref outputs "out")))))))))
-    (native-inputs
-     `(("jdk" ,icedtea-7 "jdk")
-       ("zip" ,zip)
-       ("unzip" ,unzip)))))
-
 (define-public ant-apache-bcel
   (package
-    (inherit ant/java8)
+    (inherit ant)
     (name "ant-apache-bcel")
     (arguments
-     (substitute-keyword-arguments (package-arguments ant/java8)
+     (substitute-keyword-arguments (package-arguments ant)
        ((#:phases phases)
         #~(modify-phases #$phases
             (add-after 'unpack 'link-bcel
@@ -2200,37 +2167,11 @@ build process and its dependencies, whereas Make uses Makefile format.")
                   (delete-file-recursively bin)
                   (delete-file-recursively lib))))))))
     (inputs
-     (modify-inputs (package-inputs ant/java8)
+     (modify-inputs (package-inputs ant)
        (prepend java-commons-bcel)))))
 
-(define-public ant-junit
-  (package
-    (inherit ant/java8)
-    (name "ant-junit")
-    (arguments
-     (substitute-keyword-arguments (package-arguments ant/java8)
-       ((#:phases phases)
-        #~(modify-phases #$phases
-            (add-after 'unpack 'link-junit
-              (lambda* (#:key inputs #:allow-other-keys)
-                (for-each (lambda (file)
-                            (symlink file
-                                     (string-append "lib/optional/"
-                                                    (basename file))))
-                          (find-files (assoc-ref inputs "java-junit")
-                                      "\\.jar$"))))
-            (add-after 'build 'install
-              (lambda _
-                (let ((share (string-append #$output "/share/java"))
-                      (bin   (string-append #$output "/bin"))
-                      (lib   (string-append #$output "/lib")))
-                  (mkdir-p share)
-                  (install-file (string-append lib "/ant-junit.jar") share)
-                  (delete-file-recursively bin)
-                  (delete-file-recursively lib))))))))
-    (inputs
-     (modify-inputs (package-inputs ant/java8)
-       (prepend java-junit)))))
+(define-deprecated-package ant-junit
+  ant)
 
 (define-public libantlr3c
   (package
@@ -3337,6 +3278,9 @@ is implemented.")
      `(;; Tests require junit
        #:tests? #f
        #:jar-name "qdox.jar"
+       ;; Explicitely use an ant version that includes the junit tasks, since
+       ;; it is a dependency of junit.
+       #:ant ,ant/java7
        #:phases
        (modify-phases %standard-phases
          (replace 'unpack
@@ -3445,6 +3389,9 @@ documentation tools.")
      `(;; Tests require junit, which ultimately depends on this package.
        #:tests? #f
        #:build-target "jar"
+       ;; Explicitely use an ant version that includes the junit tasks, since
+       ;; it is a dependency of junit.
+       #:ant ,ant/java7
        #:phases
        (modify-phases %standard-phases
          (add-before 'build 'do-not-use-bundled-asm
@@ -3543,6 +3490,9 @@ testing frameworks, mocking libraries and UI validation rules.")
     (build-system ant-build-system)
     (arguments
      `(#:tests? #f ; Tests require junit
+       ;; Explicitely use an ant version that includes the junit tasks, since
+       ;; it is a dependency of junit.
+       #:ant ,ant/java7
        #:modules ((guix build ant-build-system)
                   (guix build java-utils)
                   (guix build utils)
@@ -3628,6 +3578,9 @@ testing frameworks, mocking libraries and UI validation rules.")
     (native-inputs '())
     (arguments
      `(#:tests? #f
+       ;; Explicitely use an ant version that includes the junit tasks, since
+       ;; it is a dependency of junit.
+       #:ant ,ant/java7
        #:phases
        (modify-phases %standard-phases
          (delete 'configure)
@@ -3669,7 +3622,7 @@ testing frameworks, mocking libraries and UI validation rules.")
 (define-public java-junit
   (package
     (name "java-junit")
-    (version "4.12")
+    (version "4.13.2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -3678,7 +3631,7 @@ testing frameworks, mocking libraries and UI validation rules.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1j8avi91px1z8rjc89cfikwrvfifdmmsarwiyrcnr59ynvpz0v8h"))
+                "1r7k4zzscc8019np3is3bzfigw8fxd6s3259cbhzzh02q6d5p9h3"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -3690,6 +3643,9 @@ testing frameworks, mocking libraries and UI validation rules.")
      `(#:jar-name "junit.jar"
        #:source-dir "src/main/java"
        #:test-dir "src/test"
+       ;; Explicitely use an ant version that includes the junit tasks, so
+       ;; we can run the tests.
+       #:ant ,ant/java7
        #:test-exclude (list "**/SimpleTest.java" "**/StackTracesTest.java"
                             "**/RuleChainTest.java" "**/TestWatchmanTest.java")
        #:phases
@@ -3730,7 +3686,13 @@ sharing common test data, and test runners for running tests.")
      `(#:jar-name "junitparams.jar"
        #:source-dir "src/main/java"
        #:test-dir "src/test"
-       #:test-exclude (list "**/SuperclassTest.java")))
+       #:test-exclude (list
+                        ;; Abstract class: no tests
+                        "**/SuperclassTest.java"
+                        ;; Incompatible tests with junit 4.13.2
+                        "**/BeforeAfterClassTest.java"
+                        "**/FilterableTest.java"
+                        "**/RulesTest.java")))
     (inputs
      (list java-junit))
     (native-inputs
@@ -5199,6 +5161,9 @@ complex transformations and code analysis tools.")
     (build-system ant-build-system)
     (arguments
      `(#:tests? #f
+       ;; Explicitely use an ant version that includes the junit tasks, since
+       ;; it is a dependency of junit.
+       #:ant ,ant/java7
        #:phases
        (modify-phases %standard-phases
          (delete 'unpack)
@@ -5220,6 +5185,9 @@ including java-asm.")
     (properties '((hidden? . #t)))
     (arguments
      (substitute-keyword-arguments (package-arguments java-asm)
+       ;; Explicitely use an ant version that includes the junit tasks, since
+       ;; it is a dependency of junit.
+       ((#:ant _ ant/java7) ant/java7)
        ((#:tests? _) #f)))
     (native-inputs `())))
 

gnu/packages/linux.scm

@@ -4266,16 +4266,15 @@ intercept and print the system calls executed by the program.")
 (define-public alsa-ucm-conf
   (package
     (name "alsa-ucm-conf")
-    (version "1.2.15.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/alsa-project/alsa-ucm-conf")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1mlvzvz7npdvprlq1ff9pg3awsdvv3czv7wchfm96jflhks3pnsm"))))
+    (version "1.2.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "ftp://ftp.alsa-project.org/pub/lib/" name "-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "10dfzvrmpp9swflw47nxf35an6gj3ilb4wlggdnng8g2637h2z1q"))))
     (build-system copy-build-system)
     (arguments
      '(#:install-plan
@@ -4284,24 +4283,23 @@ intercept and print the system calls executed by the program.")
     (home-page "https://www.alsa-project.org/wiki/Main_Page")
     (synopsis "The Advanced Linux Sound Architecture Use Case Manager")
     (description
-     "This package contains @acronym{ALSA, Advanced Linux Sound Architecture}
-@acronym{UCM, Use Case Manager} configuration of audio input/output names and
-routing for specific audio hardware.")
+     "This package contains Advanced Linux Sound Architecture Use Case Manager
+configuration of audio input/output names and routing for specific audio
+hardware.")
     (license license:bsd-3)))
 
 (define-public alsa-topology-conf
   (package
     (name "alsa-topology-conf")
-    (version "1.2.5.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/alsa-project/alsa-topology-conf")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "150065nc5ksrxcay0ia0f8ad2s0gpp3xgn7gc5xsyf0k5dwdby49"))))
+    (version "1.2.4")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "ftp://ftp.alsa-project.org/pub/lib/" name "-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "01zdg6q4s6d01k39z96wi4vbhrfw1i2g4yi5dijwfk6a5vjfdq2m"))))
     (build-system copy-build-system)
     (arguments
      '(#:install-plan
@@ -4309,23 +4307,22 @@ routing for specific audio hardware.")
     (home-page "https://www.alsa-project.org/wiki/Main_Page")
     (synopsis "The Advanced Linux Sound Architecture libraries")
     (description
-     "This package contains @acronym{ALSA, Advanced Linux Sound Architecture}
-topology configuration files that can be used for specific audio hardware.")
+     "This package contains Advanced Linux Sound Architecture topology
+configuration files that can be used for specific audio hardware.")
     (license license:bsd-3)))
 
 (define-public alsa-lib
   (package
     (name "alsa-lib")
-    (version "1.2.15.3")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/alsa-project/alsa-lib")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "03h35rhyzks0m96zy94vipwbjbpp323bj7hhhh28qfs8jpbl3c7i"))))
+    (version "1.2.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://www.alsa-project.org/files/pub/lib/"
+                    name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "0kdvjlknc50fwfdkxj0z12xbz21skb3gnwlh6lvsvycmp5ljygwz"))))
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
@@ -4357,24 +4354,22 @@ topology configuration files that can be used for specific audio hardware.")
     (home-page "https://www.alsa-project.org/wiki/Main_Page")
     (synopsis "The Advanced Linux Sound Architecture libraries")
     (description
-     "@acronym{ALSA, Advanced Linux Sound Architecture} provides audio and
-@acronym{MIDI, Musical Instrument Digital Interface} functionality to the
-Linux-based operating system.")
+     "The Advanced Linux Sound Architecture (ALSA) provides audio and
+MIDI functionality to the Linux-based operating system.")
     (license license:lgpl2.1+)))
 
 (define-public alsa-utils
   (package
     (name "alsa-utils")
-    (version "1.2.15.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/alsa-project/alsa-utils")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1mlvzvz7npdvprlq1ff9pg3awsdvv3czv7wchfm96jflhks3pnsm"))))
+    (version "1.2.11")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://www.alsa-project.org/files/pub/utils/"
+                    name "-" version ".tar.bz2"))
+              (sha256
+               (base32
+                "19r8qi6b7sd2p1mhxfqrp18wrgjw5s6rp5ygimb1w59zi0xcmils"))))
     (build-system gnu-build-system)
     (arguments
      (list
@@ -4398,9 +4393,8 @@ Linux-based operating system.")
     (home-page "http://www.alsa-project.org/")
     (synopsis "Utilities for the Advanced Linux Sound Architecture (ALSA)")
     (description
-     "@acronym{ALSA, Advanced Linux Sound Architecture} provides audio and
-@acronym{MIDI, Musical Instrument Digital Interface} functionality to the
-Linux-based operating system.")
+     "The Advanced Linux Sound Architecture (ALSA) provides audio and
+MIDI functionality to the Linux-based operating system.")
 
     ;; This is mostly GPLv2+ but a few files such as 'alsactl.c' are
     ;; GPLv2-only.
@@ -4409,16 +4403,14 @@ Linux-based operating system.")
 (define-public alsa-plugins
   (package
     (name "alsa-plugins")
-    (version "1.2.12")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/alsa-project/alsa-plugins")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0izvzdvw3nj69l4a968p9d9xjxfxs7i3bdpj1r4cvm6b8w7j33z8"))))
+    (version "1.2.2")
+    (source (origin
+             (method url-fetch)
+             (uri (string-append "ftp://ftp.alsa-project.org/pub/plugins/"
+                                 name "-" version ".tar.bz2"))
+             (sha256
+              (base32
+               "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw"))))
     (build-system gnu-build-system)
     ;; TODO: Split libavcodec and speex if possible. It looks like they can not
     ;; be split, there are references to both in files.
@@ -4470,12 +4462,11 @@ Linux-based operating system.")
     (home-page "http://www.alsa-project.org/")
     (synopsis "Plugins for the Advanced Linux Sound Architecture (ALSA)")
     (description
-     "@acronym{ALSA, Advanced Linux Sound Architecture} provides audio and
-@acronym{MIDI, Musical Instrument Digital Interface} functionality to the
-Linux-based operating system.  This package enhances @acronym{ALSA} by
-providing additional plugins which include: upmixing, downmixing, jackd and
-pulseaudio support for native alsa applications, format conversion (s16 to
-a52), and external rate conversion.")
+     "The Advanced Linux Sound Architecture (ALSA) provides audio and
+MIDI functionality to the Linux-based operating system.  This package enhances ALSA
+by providing additional plugins which include: upmixing, downmixing, jackd and
+pulseaudio support for native alsa applications, format conversion (s16 to a52), and
+external rate conversion.")
     (license (list license:gpl2+
                    ;; `rate/rate_samplerate.c': LGPL v2.1 or later.
                    license:lgpl2.1+))))

gnu/packages/luanti.scm

@@ -488,7 +488,7 @@ with different rules and mechanics.")
 (define-public luanti-mineclonia
   (package
     (name "luanti-mineclonia")
-    (version "0.120.1")
+    (version "0.121.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -497,7 +497,7 @@ with different rules and mechanics.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "135xllkvdravry25y1f94wqn7nxb0pnrpn7xiagh2b5vjbajhdg4"))))
+                "1c3x59iq04vfc0fa09z6g8davrr2vhdywppdbgyw64n7vk4f6br9"))))
     (build-system copy-build-system)
     (arguments
      `(#:install-plan

gnu/packages/nvi.scm

@@ -1,8 +1,4 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
-;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
-;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,98 +16,8 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages nvi)
-  #:use-module (gnu packages)
-  #:use-module (gnu packages autotools)
-  #:use-module (gnu packages dbm)
-  #:use-module (gnu packages ncurses)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix gexp)
-  #:use-module (guix licenses)
-  #:use-module (guix utils))
+  #:use-module (gnu packages text-editors)
+  #:use-module (guix deprecation))
 
-(define-public nvi
-  (package
-    (name "nvi")
-    (version "1.81.6")
-    (source
-      (origin
-        (method url-fetch)
-        (uri          ;; sites.google.coma/bostic.com/keithbostic/vi is stale.
-          (string-append "http://harrier.slackbuilds.org/misc/nvi-" version
-                         ".tar.bz2"))
-        (sha256
-          (base32 "0nbbs1inyrqds0ywn3ln5slv54v5zraq7lszkg8nsavv4kivhh9l"))
-        (patches (search-patches "nvi-assume-preserve-path.patch"
-                                 "nvi-dbpagesize-binpower.patch"
-                                 "nvi-add-function-prototypes.patch"
-                                 "nvi-db4.patch"))
-        (modules '((guix build utils)))
-        (snippet
-          ;; Create a wrapper for the configure script, make it executable.
-          '(let ((conf-wrap (open-output-file "configure")))
-             (display "#!/bin/sh" conf-wrap)
-             (newline conf-wrap)
-             (display
-               "../nvi-1.81.6/dist/configure --srcdir=../nvi-1.81.6/dist $@"
-               conf-wrap)
-             (newline conf-wrap)
-             (close-output-port conf-wrap)
-             (chmod "configure" #o0755)
-
-             ;; Glibc 2.30 removed the deprecated <sys/stropts.h>, so fall back
-             ;; to the internal PTY allocation logic.
-             (substitute* "ex/ex_script.c"
-               (("#ifdef HAVE_SYS5_PTY")
-                "#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)"))
-             #t))))
-
-    (build-system gnu-build-system)
-    (arguments
-     (list
-      #:out-of-source? #t
-      #:configure-flags
-      #~'("--enable-widechar"
-          #$@(if (%current-target-system)
-                 '("vi_cv_sprintf_count=yes")
-                 '()))
-      #:make-flags
-      #~(list
-         ;; Add CFLAGS to relax gcc-14's strictness.
-         ;; nvi's configure chokes on passing CFLAGS and ignores
-         ;; CFLAGS set in the environment.
-         (string-append "CFLAGS=-g -O2"
-                        " -Wno-error=incompatible-pointer-types"))
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'configure 'fix-configure
-            (lambda* (#:key inputs native-inputs #:allow-other-keys)
-              ;; Replace outdated config.sub and config.guess:
-              (with-directory-excursion "dist"
-                (for-each
-                 (lambda (file)
-                   (chmod file #o755)
-                   (install-file
-                    (format #f "~a/share/automake-~a/~a"
-                            (assoc-ref (or native-inputs inputs)
-                                       "automake")
-                            #$(version-major+minor
-                               (package-version automake))
-                            file)
-                    "."))
-                 '("config.sub" "config.guess"))))))))
-    (inputs
-      (list bdb ncurses))
-    (native-inputs
-     (list automake)) ;Up to date 'config.guess' and 'config.sub'.
-    (synopsis "The Berkeley Vi Editor")
-    (description
-      "Vi is the original screen based text editor for Unix systems.  It is
-considered the standard text editor, and is available on almost all Unix
-systems.  Nvi is intended as a \"bug-for-bug compatible\" clone of the
-original BSD vi editor.  As such, it doesn't have a lot of snazzy features as
-do some of the other vi clones such as elvis and vim.  However, if all you
-want is vi, this is the one to get.")
-    (home-page "https://sites.google.com/a/bostic.com/keithbostic/vi")
-    (license bsd-3)))
+(define-deprecated/public-alias nvi
+  (@ (gnu packages text-editors) nvi))

gnu/packages/prolog.scm

@@ -237,7 +237,7 @@ it.")
 (define-public trealla
   (package
     (name "trealla")
-    (version "2.92.38")
+    (version "2.92.41")
     (source
      (origin
        (method git-fetch)
@@ -246,7 +246,7 @@ it.")
           (url "https://github.com/trealla-prolog/trealla")
           (commit (string-append "v" version))))
        (sha256
-        (base32 "12nv54j7rgh784lszgynw50k9h3la8b0d2si2bskfvydmpyk45pm"))
+        (base32 "0ial37h0i9zjxgxvkai2vmaafn4djprliw0nzppnhwwy3jbcd14p"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (inputs

gnu/packages/text-editors.scm

@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
 ;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Marek Benc <merkur32@gmail.com>
 ;;; Copyright © 2015-2022, 2025 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 José Miguel Sánchez García <jmi2k@openmailbox.org>
 ;;; Copyright © 2016 Carlo Zancanaro <carlo@zancanaro.id.au>
@@ -42,6 +43,7 @@
 ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.com>
 ;;; Copyright © 2025 Junker <dk@junkeria.club>
 ;;; Copyright © 2025 benjamin wil <hey@benjaminwil.info>
+;;; Copyright © 2025 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2026 Ignatius Menzies <ignatius.menzies@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -92,6 +94,7 @@
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages datastructures)
+  #:use-module (gnu packages dbm)
   #:use-module (gnu packages documentation)
   #:use-module (gnu packages enchant)
   #:use-module (gnu packages fontutils)
@@ -987,6 +990,90 @@ justifying, auto-indentation, bracket matching, interactive search-and-replace
 (with regular expressions), and the editing of multiple files.")
     (license license:gpl3+))) ; some files are under GPLv2+
 
+(define-public nvi
+  (package
+    (name "nvi")
+    (version "1.81.6")
+    (source
+     (origin
+       (method url-fetch)
+       ;; The home-page does not provide the latest version.
+       (uri (string-append "http://harrier.slackbuilds.org/misc/nvi-"
+                           version ".tar.bz2"))
+       (sha256
+        (base32 "0nbbs1inyrqds0ywn3ln5slv54v5zraq7lszkg8nsavv4kivhh9l"))
+       (patches (search-patches "nvi-assume-preserve-path.patch"
+                                "nvi-dbpagesize-binpower.patch"
+                                "nvi-add-function-prototypes.patch"
+                                "nvi-db4.patch"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; Create a wrapper for the configure script, make it executable.
+        #~(let ((conf-wrap (open-output-file "configure")))
+            (display "#!/bin/sh" conf-wrap)
+            (newline conf-wrap)
+            (display
+              "../nvi-1.81.6/dist/configure --srcdir=../nvi-1.81.6/dist $@"
+              conf-wrap)
+            (newline conf-wrap)
+            (close-output-port conf-wrap)
+            (chmod "configure" #o0755)
+
+            ;; Glibc 2.30 removed the deprecated <sys/stropts.h>, so fall back
+            ;; to the internal PTY allocation logic.
+            (substitute* "ex/ex_script.c"
+              (("#ifdef HAVE_SYS5_PTY")
+               "#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)"))))))
+    (build-system gnu-build-system)
+    (arguments
+     (list
+      #:out-of-source? #t
+      #:configure-flags
+      #~'("--enable-widechar"
+          #$@(if (%current-target-system)
+                 '("vi_cv_sprintf_count=yes")
+                 '()))
+      #:make-flags
+      #~(list
+         ;; Add CFLAGS to relax gcc-14's strictness.
+         ;; nvi's configure chokes on passing CFLAGS and ignores
+         ;; CFLAGS set in the environment.
+         (string-append "CFLAGS=-g -O2"
+                        " -Wno-error=incompatible-pointer-types"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'configure 'fix-configure
+            (lambda* (#:key inputs native-inputs #:allow-other-keys)
+              ;; Replace outdated config.sub and config.guess:
+              (with-directory-excursion "dist"
+                (for-each
+                 (lambda (file)
+                   (chmod file #o755)
+                   (install-file
+                    (format #f "~a/share/automake-~a/~a"
+                            (assoc-ref (or native-inputs inputs)
+                                       "automake")
+                            #$(version-major+minor
+                               (package-version automake))
+                            file)
+                    "."))
+                 '("config.sub" "config.guess"))))))))
+    (inputs (list bdb ncurses))
+    (native-inputs
+     (list automake)) ;Up to date 'config.guess' and 'config.sub'.
+    (synopsis "The Berkeley Vi Editor")
+    (description
+     "Vi is the original screen based text editor for Unix systems.  It
+is considered the standard text editor, and is available on almost all
+Unix systems.  Nvi is intended as a \"bug-for-bug compatible\" clone of
+the original BSD vi editor.  As such, it doesn't have a lot of snazzy
+features as do some of the other vi clones such as elvis and vim.
+However, if all you want is vi, this is the one to get.")
+    (home-page
+     (string-append "https://sites.google.com/a/bostic.com/keithbostic/"
+                    "the-berkeley-vi-editor-home-page"))
+    (license license:bsd-3)))
+
 (define-public qemacs
   (package
     (name "qemacs")

gnu/packages/wm.scm

@@ -4535,7 +4535,7 @@ read and write, and compatible with JSON.")
 (define-public labwc
   (package
     (name "labwc")
-    (version "0.9.6")
+    (version "0.9.7")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -4544,7 +4544,7 @@ read and write, and compatible with JSON.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0v8gv539jl8qnzjh9d91gpk03gn1xkc8i8xl33gs9k2x46fx1jyy"))))
+                "12mm4w9djgh7q30lswhl1q1cxf6h0pf8xr744jkcyjcqqsavynpf"))))
     (build-system meson-build-system)
     (native-inputs
      (list pkg-config gettext-minimal scdoc))

gnu/system.scm

@@ -62,7 +62,6 @@
   #:use-module (gnu packages less)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages man)
-  #:use-module (gnu packages nvi)
   #:use-module (gnu packages package-management)
   #:use-module (gnu packages pciutils)
   #:use-module (gnu packages texinfo)