all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Mathieu Lirzin <mthl@gnu.org>
To: guix-devel@gnu.org
Subject: [PATCH 2/3] gnu: Add reposurgeon.
Date: Sat,  9 Apr 2016 21:26:24 +0200	[thread overview]
Message-ID: <1460229985-13257-3-git-send-email-mthl@gnu.org> (raw)
In-Reply-To: <1460229985-13257-1-git-send-email-mthl@gnu.org>

[-- Attachment #1: Type: text/plain, Size: 206 bytes --]


* gnu/packages/version-control.scm (reposurgeon): New variable.
---
 gnu/packages/version-control.scm | 68 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 66 insertions(+), 2 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-reposurgeon.patch --]
[-- Type: text/x-patch; name="0002-gnu-Add-reposurgeon.patch", Size: 4453 bytes --]

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 0b70d54..bc28498 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
 ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013, 2014 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2015 Mathieu Lirzin <mthl@openmailbox.org>
+;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
@@ -27,7 +27,7 @@
 
 (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 functions.")
     (license gpl3+)))
 
+(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" "repomapper.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 doesn't
+             ;; provide them.  This is making the build not reproducible.
+             (substitute* "reposurgeon.xml"
+               (("<refsect2><title>WRITING ")
+                "<refsect2 id='writing'><title>WRITING ")
+               (("<refsect2><title>READING")
+                "<refsect2 id='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=" (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-control
+systems don't want to let you do, such as editing past comments and metadata
+and removing commits.  It works with any version control system that can
+export and import Git fast-import streams, including Git, Mercurial, Fossil,
+Bazaar, CVS, RCS, and Src.  It can also read Subversion dump files directly
+and can thus be used to script production of very high-quality conversions
+from Subversion to any supported Distributed Version Control System (DVCS).")
+    (license (list bsd-2 bsd-3))))
+
 (define-public tig
   (package
     (name "tig")

  parent reply	other threads:[~2016-04-09 19:26 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-09 19:26 [PATCH 0/3] Add reposurgeon Mathieu Lirzin
2016-04-09 19:26 ` [PATCH 1/3] gnu: Add docbook-xml-4.1.2 Mathieu Lirzin
2016-04-13 20:54   ` Ludovic Courtès
2016-04-09 19:26 ` Mathieu Lirzin [this message]
2016-04-13 21:01   ` [PATCH 2/3] gnu: Add reposurgeon Ludovic Courtès
2016-04-21 15:44     ` Mathieu Lirzin
2016-04-24 21:20       ` Ludovic Courtès
2016-04-09 19:26 ` [PATCH 3/3] doc: Add a reference to 'Invoking guix archive' Mathieu Lirzin
2016-04-13 21:01   ` Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1460229985-13257-3-git-send-email-mthl@gnu.org \
    --to=mthl@gnu.org \
    --cc=guix-devel@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.