From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mathieu Lirzin Subject: [PATCH 2/3] gnu: Add reposurgeon. Date: Sat, 9 Apr 2016 21:26:24 +0200 Message-ID: <1460229985-13257-3-git-send-email-mthl@gnu.org> References: <1460229985-13257-1-git-send-email-mthl@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------2.8.0.rc3" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoyWo-0005AR-9P for guix-devel@gnu.org; Sat, 09 Apr 2016 15:26:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoyWl-0008Bf-98 for guix-devel@gnu.org; Sat, 09 Apr 2016 15:26:42 -0400 In-Reply-To: <1460229985-13257-1-git-send-email-mthl@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------2.8.0.rc3 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable * gnu/packages/version-control.scm (reposurgeon): New variable. --- gnu/packages/version-control.scm | 68 ++++++++++++++++++++++++++++++++++= ++++-- 1 file changed, 66 insertions(+), 2 deletions(-) --------------2.8.0.rc3 Content-Type: text/x-patch; name="0002-gnu-Add-reposurgeon.patch" Content-Disposition: inline; filename="0002-gnu-Add-reposurgeon.patch" Content-Transfer-Encoding: quoted-printable diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-cont= rol.scm index 0b70d54..bc28498 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3,7 +3,7 @@ ;;; Copyright =C2=A9 2013 Cyril Roelandt ;;; Copyright =C2=A9 2013, 2014, 2015, 2016 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2013, 2014 Andreas Enge -;;; Copyright =C2=A9 2015 Mathieu Lirzin +;;; Copyright =C2=A9 2015, 2016 Mathieu Lirzin ;;; Copyright =C2=A9 2014, 2015 Mark H Weaver ;;; Copyright =C2=A9 2014 Eric Bavier ;;; Copyright =C2=A9 2015, 2016 Efraim Flashner @@ -27,7 +27,7 @@ =20 (define-module (gnu packages version-control) #:use-module ((guix licenses) - #:select (asl2.0 bsd-2 + #:select (asl2.0 bsd-2 bsd-3 gpl1+ gpl2 gpl2+ gpl3+ lgpl2.1 x11-style)) #:use-module (guix utils) @@ -1013,6 +1013,70 @@ as possible. Resolution of contention for source = files, a major headache for any project with more than one developer, is one of Aegis's major functi= ons.") (license gpl3+))) =20 +(define-public reposurgeon + (package + (name "reposurgeon") + (version "3.37") + (source (origin + (method url-fetch) + (uri (string-append "http://www.catb.org/~esr/" + name "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "14asjg4xy3mhh5z0r3k7c1wv9y803j2zfq32g5q5m95sf7yzygan"))= )) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;no test suite distributed + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'fix-docbook + (lambda* (#:key inputs #:allow-other-keys) + (setenv "XML_CATALOG_FILE" + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/manpages/docbook.xsl")) + (substitute* '("repocutter.xml" "repodiffer.xml" "repomappe= r.xml" + "reposurgeon.xml" "repotool.xml") + (("docbook/docbookx.dtd") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/docbookx.dtd"))) + ;; xsltproc generates random ids when the source document d= oesn't + ;; provide them. This is making the build not reproducible= . + (substitute* "reposurgeon.xml" + (("WRITING ") + "<refsect2 id=3D'writing'><title>WRITING ") + (("<refsect2><title>READING") + "<refsect2 id=3D'reading'><title>READING")) + #t)) + (add-after 'install 'install-emacs-data + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (install-file "reposurgeon-mode.el" + (string-append out "/share/emacs/site-lisp"= )) + #t)))) + #:make-flags + (list (string-append "target=3D" (assoc-ref %outputs "out"))))) + (inputs + `(("python" ,python-wrapper))) + (native-inputs + `(("asciidoc" ,asciidoc) + ("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xsl" ,docbook-xsl) + ("libxml2" ,libxml2) + ("xmlto" ,xmlto))) + (home-page "http://www.catb.org/~esr/reposurgeon/") + (synopsis "Edit version-control repository history") + (description "Reposurgeon enables risky operations that version-cont= rol +systems don't want to let you do, such as editing past comments and meta= data +and removing commits. It works with any version control system that can +export and import Git fast-import streams, including Git, Mercurial, Fos= sil, +Bazaar, CVS, RCS, and Src. It can also read Subversion dump files direc= tly +and can thus be used to script production of very high-quality conversio= ns +from Subversion to any supported Distributed Version Control System (DVC= S).") + (license (list bsd-2 bsd-3)))) + (define-public tig (package (name "tig") --------------2.8.0.rc3--