diff options
| author | Anderson Torres <anderson.torres.8519@gmail.com> | 2025-12-09 21:59:32 -0300 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-12-13 23:14:28 +0100 |
| commit | 805dd1764ed2b34f032075ed962886064c443806 (patch) | |
| tree | 9df098e029f68cecbc48eb00749ab201a3fe49be /gnu/packages/patchutils.scm | |
| parent | 0a86d834fabe76fc333fdc1b13abc85bf1778ecf (diff) | |
gnu: wdiff: Migrate from (gnu packages wdiff) to (gnu packages patchutils).
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 <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/patchutils.scm')
| -rw-r--r-- | gnu/packages/patchutils.scm | 36 |
1 files changed, 35 insertions, 1 deletions
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 1475ab51dc4..5ab8f58e3a0 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 <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") |