From 805dd1764ed2b34f032075ed962886064c443806 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 9 Dec 2025 21:59:32 -0300 Subject: [PATCH] gnu: wdiff: Migrate from (gnu packages wdiff) to (gnu packages patchutils). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit wdiff is a single leaf package; there is few to no reason to keep it isolated in a single file. Given that patchutils.scm has similar packages, e.g. @code{vbindiff}, it is a good choice to receive wdiff. * gnu/local.mk: Remove reference to wdiff.scm. * gnu/packages/wdiff.scm: Delete file. (wdiff): Move from here ... * gnu/packages/patchutils.scm: ... to here. Update copyright commentaries. Add module (gnu packages texinfo). * po/packages/POTFILES.in: Remove reference to wdiff.scm. Change-Id: Ife2c051c209948afafe67854a315bdfa1a604f52 Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/patchutils.scm | 36 +++++++++++++++++++++- gnu/packages/wdiff.scm | 59 ------------------------------------- po/packages/POTFILES.in | 1 - 4 files changed, 35 insertions(+), 62 deletions(-) delete mode 100644 gnu/packages/wdiff.scm diff --git a/gnu/local.mk b/gnu/local.mk index f5de4dbfbbe8874f471b065f85bc6ecf11d93bf0..a22d0a287dbf98a086c19a109096cafaedb93cac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -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 \ diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 1475ab51dc4c6a5b94caf178c63144a6ed581f06..5ab8f58e3a098b9c77be41bc899d7c60a732af3e 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2018, 2023 Eric Bavier +;;; Copyright © 2013 Nikita Karetnikov +;;; Copyright © 2014,2017, 2018, 2023 Eric Bavier ;;; Copyright © 2015, 2018 Leo Famulari ;;; Copyright © 2018–2022 Tobias Geerinckx-Rice ;;; Copyright © 2019 Christopher Baines @@ -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") diff --git a/gnu/packages/wdiff.scm b/gnu/packages/wdiff.scm deleted file mode 100644 index ec0769447fae8c0882cac5b32c60dd0f8d4449d1..0000000000000000000000000000000000000000 --- a/gnu/packages/wdiff.scm +++ /dev/null @@ -1,59 +0,0 @@ -;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013 Nikita Karetnikov -;;; Copyright © 2017 Eric Bavier -;;; -;;; 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 . - -(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+))) diff --git a/po/packages/POTFILES.in b/po/packages/POTFILES.in index 1c8945edfcf44e7ef536f1f2ffc995b9edce4d95..e52851c8b9605d0aa879aecba6bf78959494665f 100644 --- a/po/packages/POTFILES.in +++ b/po/packages/POTFILES.in @@ -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