From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikita Karetnikov Subject: [PATCH] gnu: Add GNU Wdiff. (was: GNU Wdiff: Testsuite fails) Date: Mon, 11 Feb 2013 06:48:06 -0500 Message-ID: <87wquf6ph2.fsf_-_@karetnikov.org> References: <87622730u8.fsf@karetnikov.org> <87sj5buoo7.fsf@gnu.org> <87wqukv4t9.fsf@karetnikov.org> <87y5f0idnm.fsf@gnu.org> <87a9rexkfn.fsf@karetnikov.org> <87liaxbjta.fsf@gnu.org> <871ucnsa32.fsf@karetnikov.org> <874nhj438v.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha1; protocol="application/pgp-signature" Return-path: Received: from eggs.gnu.org ([208.118.235.92]:59934) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U4rrj-0007s6-1O for bug-guix@gnu.org; Mon, 11 Feb 2013 06:48:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U4rrf-0006wu-0T for bug-guix@gnu.org; Mon, 11 Feb 2013 06:48:06 -0500 In-Reply-To: <874nhj438v.fsf@gnu.org> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?= =?utf-8?Q?s?= message of "(unknown date)") List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org Sender: bug-guix-bounces+gcggb-bug-guix=m.gmane.org@gnu.org To: Ludovic =?utf-8?Q?Court=C3=A8s?= Cc: bug-guix@gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= > I believe this should be enough. Thanks, it worked. Can I push this one? --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-Add-GNU-Wdiff.patch Content-Transfer-Encoding: quoted-printable From=20a9401ad161426d664779fa030b30616bb3c36058 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Mon, 11 Feb 2013 11:39:05 +0000 Subject: [PATCH] gnu: Add GNU Wdiff. * gnu/packages/wdiff.scm: New file. * Makefile.am (MODULES): Add it. =2D-- Makefile.am | 1 + gnu/packages/wdiff.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 62 insertions(+), 0 deletions(-) create mode 100644 gnu/packages/wdiff.scm diff --git a/Makefile.am b/Makefile.am index f9b64e7..bc41d86 100644 =2D-- a/Makefile.am +++ b/Makefile.am @@ -144,6 +144,7 @@ MODULES =3D \ gnu/packages/texlive.scm \ gnu/packages/time.scm \ gnu/packages/tor.scm \ + gnu/packages/wdiff.scm \ gnu/packages/wget.scm \ gnu/packages/which.scm \ gnu/packages/xml.scm \ diff --git a/gnu/packages/wdiff.scm b/gnu/packages/wdiff.scm new file mode 100644 index 0000000..02d536c =2D-- /dev/null +++ b/gnu/packages/wdiff.scm @@ -0,0 +1,61 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright =C2=A9 2013 Nikita Karetnikov +;;; +;;; 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 screen) + #:use-module (gnu packages which)) + +(define-public wdiff + (package + (name "wdiff") + (version "1.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnu/wdiff/wdiff-" + version ".tar.gz")) + (sha256 + (base32 + "0q78y5awvjjmsvizqilbpwany62shlmlq2ayxkjbygmdafpk1k8j")))) + (build-system gnu-build-system) + (arguments + `(#:phases (alist-cons-before + 'check 'fix-sh + (lambda _ + (substitute* "tests/testsuite" + (("#! /bin/sh") + (string-append "#!" (which "sh"))))) + %standard-phases))) + (inputs `(("screen" ,screen) + ("which" ,which))) + (home-page "https://www.gnu.org/software/wdiff/") + (synopsis + "GNU Wdiff, a tool for comparing files on a word by word basis") + (description + "GNU Wdiff is a front end to 'diff' for comparing files on a word per +word basis. A word is anything between whitespace. This is useful for +comparing two texts in which a few words have been changed and for which +paragraphs have been refilled. It works by creating two temporary files, = one +word per line, and then executes 'diff' on these files. It collects the +'diff' output and uses it to produce a nicer display of word differences +between the original files.") + (license gpl3+))) \ No newline at end of file =2D-=20 1.7.5.4 --=-=-=-- --==-=-= Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQIcBAEBAgAGBQJRGNqNAAoJEM+IQzI9IQ38EzgP/AlBPsWIiydJ/LhrIJoJc2mr QReHFtMISjdGG8rHpSA3AcvHGOoimm+Utkq6dnmViTczzLXEtV/IEyjo1IVbUrrj VZiDXLFgHphnriFXKMvz+Kv2IaDggiD42lhcDy7kBZCHWxJqge3Lek04i4Os5DeP WTq0cWTwuLL3B3ATC5udSew27Llt0yxjjfCRRGqrCKSxD1VxdXHfE/tCrBJtw7Qd ZGdVg+pKb1PNV9MWR5KF19ETwawZ5NJV98qSpHGjnyNERtoFihHvb2X8ZcVFiaop hnwsp1f+emw9shYFeRl+j9v4j/FezkstkesP0GCPeyptT6ojv3r0bA95W/J33peq 0L2zID3ObKP2Pa5m1FuuEG7kg6TZv9ta1X0tv8YY6Sw1zP3f1yUXVoHPNo3Nbf1E tfu/Mb0rz/ABp76mMK7N++v3jZasNeZfouvq9J7GkgJ85MV3yjyE8KMJ26FTlDNI XdHFaHC9BdN6So6I9jcpMK57fHt/4Q6bB1IOu62r7PzbMv6FVnJjcKegwr5qNxOT Oj8O8ktW/cVcxuyrem2ZqF0N0gTl33weS8LRUoPRXYG+uy1DHq68bzJ2pVTMicJ8 h+NKsrx9eDvRLHVV+HQu+1Ad3+oxAv5eG+TDiIW7bNAYQN1IxKkeDTru1jzsPKqX nCsS6RgOX8V68qA/BPWb =3PmK -----END PGP SIGNATURE----- --==-=-=--