4 files changed, 35 insertions(+), 62 deletions(-)

M gnu/local.mk
M gnu/packages/patchutils.scm
D gnu/packages/wdiff.scm
M po/packages/POTFILES.in

@@ 695,7 695,6 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/vpn.scm				\
   %D%/packages/vulkan.scm			\
   %D%/packages/w3m.scm				\
-  %D%/packages/wdiff.scm			\
   %D%/packages/weather.scm			\
   %D%/packages/web.scm				\
   %D%/packages/web-browsers.scm			\

@@ 1,5 1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2018, 2023 Eric Bavier <bavier@posteo.net>
+;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
+;;; Copyright © 2014,2017, 2018, 2023 Eric Bavier <bavier@posteo.net>
 ;;; Copyright © 2015, 2018 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Christopher Baines <mail@cbaines.net>


@@ 51,6 52,7 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages texinfo)
   #:use-module (gnu packages text-editors)
   #:use-module (gnu packages time)
   #:use-module (gnu packages version-control)


@@ 526,6 528,38 @@ Users can login allowing them to change the state of patches.")
     (home-page "http://jk.ozlabs.org/projects/patchwork/")
     (license license:gpl2+)))
 
+(define-public wdiff
+  (package
+    (name "wdiff")
+    (version "1.2.2")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "mirror://gnu/wdiff/wdiff-"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "0sxgg0ms5lhi4aqqvz1rj4s77yi9wymfm3l3gbjfd1qchy66kzrl"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:phases (modify-phases %standard-phases
+                  (add-before 'check 'fix-sh
+                    (lambda _
+                      (substitute* "tests/testsuite"
+                        (("#! /bin/sh")
+                         (string-append "#!" (which "sh")))))))))
+    (native-inputs
+     (list which
+           ;; For some reason wdiff.info gets rebuilt.
+           texinfo))
+    (home-page "https://www.gnu.org/software/wdiff/")
+    (synopsis "Word difference finder")
+    (description
+     "GNU Wdiff is a front-end to the diff program from Diffutils that
+allows you to compare files on a word-by-word basis, where a word is anything
+between whitespace.")
+    (license license:gpl3+)))
+
 (define-public wiggle
   (package
     (name "wiggle")

@@ 1,59 0,0 @@
-;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org>
-;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
-;;;
-;;; 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/>.
-
-(define-module (gnu packages wdiff)
-  #:use-module (guix licenses)
-  #:use-module (guix packages)
-  #:use-module (guix download)
-  #:use-module (guix build-system gnu)
-  #:use-module (gnu packages texinfo)
-  #:use-module (gnu packages screen)
-  #:use-module (gnu packages base))
-
-(define-public wdiff
-  (package
-    (name "wdiff")
-    (version "1.2.2")
-    (source
-     (origin
-      (method url-fetch)
-      (uri (string-append "mirror://gnu/wdiff/wdiff-"
-                          version ".tar.gz"))
-      (sha256
-       (base32
-        "0sxgg0ms5lhi4aqqvz1rj4s77yi9wymfm3l3gbjfd1qchy66kzrl"))))
-    (build-system gnu-build-system)
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-before 'check 'fix-sh
-                    (lambda _
-                      (substitute* "tests/testsuite"
-                        (("#! /bin/sh")
-                         (string-append "#!" (which "sh")))))))))
-    (native-inputs
-     (list which
-           ;; For some reason wdiff.info gets rebuilt.
-           texinfo))
-    (home-page "https://www.gnu.org/software/wdiff/")
-    (synopsis "Word difference finder")
-    (description
-     "GNU Wdiff is a front-end to the diff program from Diffutils that
-allows you to compare files on a word-by-word basis, where a word is anything
-between whitespace.")
-    (license gpl3+)))

@@ 543,7 543,6 @@ gnu/packages/video.scm
 gnu/packages/vlang.scm
 gnu/packages/vnc.scm
 gnu/packages/w3m.scm
-gnu/packages/wdiff.scm
 gnu/packages/weather.scm
 gnu/packages/wm.scm
 gnu/packages/wordnet.scm