On Mon, 21 Dec 2015 11:39:10 +0100
l...@gnu.org (Ludovic Courtès) wrote:
> Eric Bavier <ericbav...@openmailbox.org> skribis:
>
> > On Sun, 20 Dec 2015 23:11:07 +0100
> > l...@gnu.org (Ludovic Courtès) wrote:
> >
> >> Eric Bavier <ericbav...@openmailbox.org> skribis:
> >>
> >> > +(define (unison-doc ext version hash)
> >> > + (origin
> >> > + (method url-fetch)
> >> > + (uri (string-append "https://www.seas.upenn.edu/~bcpierce/unison/";
> >> > + "download/releases/unison-" version "/unison-"
> >> > + version "-manual." ext))
> >> > + (sha256 (base32 hash))))
> >>
> >> [...]
> >>
> >> > + `(("doc-pdf"
> >> > + ,(unison-doc "pdf" version
> >> > +
> >> > "0y5mywjn352nw4wqli94gnc5vn1f72g56jqqk1nqajz0ark998nb"))
> >> > + ("doc-ps"
> >> > + ,(unison-doc "ps" version
> >> > +
> >> > "11awy1xxhmckwnx42hllmngmx8q4ck18vpwpgfqqhj0x8vx0b3ha"))
> >> > + ("doc-html"
> >> > + ,(unison-doc "html" version
> >> > +
> >> > "06myrpv067j5ffm265fm0a83gm41j9bv3ps3yiyb1hqgfy1qy3ah"))))
> >>
> >> Could we instead build them from source?
> >
> > Possibly. The documentation source is not available in the download
> > tarball, only in the developer svn repository, so we could do an svn
> > fetch of that. Would that be alright?
>
> Sure.
Attached is an updated patch that pulls the unison source from the
developer svn repository and builds the documentation from that. The
origin snippet is a bit more than I had hoped for, but it works.
`~Eric
From c8a0086db4d78091e06326a5ffe55a7bf2543091 Mon Sep 17 00:00:00 2001
From: Eric Bavier <bav...@member.fsf.org>
Date: Fri, 18 Dec 2015 19:29:22 -0600
Subject: [PATCH] gnu: unison: Add "doc" output.
* gnu/packages/ocaml.scm (unison)[source]: Use svn-fetch with snippet.
[outputs]: New field.
[native-inputs]: Add ghostscript, texlive, hevea, and lynx.
[arguments]: Add 'install-doc phase.
---
gnu/packages/ocaml.scm | 91 +++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 82 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7f80fc8..19943cf 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2014, 2015 Mark H Weaver <m...@netris.org>
;;; Copyright © 2015 Andreas Enge <andr...@enge.fr>
;;; Copyright © 2015 David Hashe <david.ha...@dhashe.com>
+;;; Copyright © 2016 Eric Bavier <bav...@member.fsf.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -23,6 +24,7 @@
#:use-module ((guix licenses) #:hide (zlib))
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix svn-download)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
@@ -36,6 +38,8 @@
#:use-module (gnu packages compression)
#:use-module (gnu packages xorg)
#:use-module (gnu packages texlive)
+ #:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages lynx)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
#:use-module (gnu packages ncurses)
@@ -496,16 +500,67 @@ libpanel, librsvg and quartz.")
(version "2.48.3")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://www.seas.upenn.edu/~bcpierce/unison/";
- "download/releases/stable/unison-" version
- ".tar.gz"))
- (sha256
- (base32
- "10sln52rnnsj213jy3166m0q97qpwnrwl6mm529xfy10x3xkq3gl"))))
+ (method svn-fetch)
+ (uri (svn-reference
+ (url (string-append "https://webdav.seas.upenn.edu/svn/";
+ "unison/branches/"
+ (version-major+minor version)))
+ (revision 535)))
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32
+ "0486s53wyayicj9f2raj2dvwvk4xyzar219rccc1iczdwixm4x05"))
+ (modules '((guix build utils)
+ (ice-9 rdelim)
+ (ice-9 regex)
+ (srfi srfi-1)))
+ (snippet
+ `(begin
+ ;; The svn revision in the release tarball appears to be
+ ;; artificially manipulated in order to set the desired point
+ ;; version number. Because the point version is calculated during
+ ;; the build, we can offset pointVersionOrigin by the desired
+ ;; point version and write that into "Rev: %d". We do this rather
+ ;; than hardcoding the necessary revision number, for
+ ;; maintainability.
+ (with-atomic-file-replacement "src/mkProjectInfo.ml"
+ (lambda (in out)
+ (let ((pt-ver (string->number (third (string-split ,version
#\.))))
+ (pt-rx (make-regexp "^let pointVersionOrigin =
([0-9]+)"))
+ (rev-rx (make-regexp "Rev: [0-9]+")))
+ (let loop ((pt-origin #f))
+ (let ((line (read-line in 'concat)))
+ (cond
+ ((regexp-exec pt-rx line)
+ => (lambda (m)
+ (begin
+ (display line out)
+ (loop (string->number (match:substring m 1))))))
+ ((regexp-exec rev-rx line)
+ => (lambda (m)
+ (begin
+ (format out "~aRev: ~d~a"
+ (match:prefix m)
+ (+ pt-origin pt-ver)
+ (match:suffix m))
+ (dump-port in out)))) ;done
+ (else
+ (display line out)
+ (loop pt-origin))))))))
+ ;; Without the '-fix' argument, the html file produced does not
+ ;; have functioning internal hyperlinks.
+ (substitute* "doc/Makefile"
+ (("hevea unison") "hevea -fix unison"))))))
(build-system gnu-build-system)
+ (outputs '("out"
+ "doc")) ; 1.9 MiB of documentation
(native-inputs
- `(("ocaml" ,ocaml)))
+ `(("ocaml" ,ocaml)
+ ;; For documentation
+ ("ghostscript" ,ghostscript)
+ ("texlive" ,texlive)
+ ("hevea" ,hevea)
+ ("lynx" ,lynx)))
(arguments
`(#:parallel-build? #f
#:parallel-tests? #f
@@ -522,7 +577,25 @@ libpanel, librsvg and quartz.")
(bin (string-append out "/bin")))
(mkdir-p bin)
(setenv "HOME" out) ; forces correct INSTALLDIR in Makefile
- #t))))))
+ #t)))
+ (add-after 'install 'install-doc
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((doc (string-append (assoc-ref outputs "doc")
+ "/share/doc/unison")))
+ (mkdir-p doc)
+ ;; This file needs write-permissions, because it's
+ ;; overwritten by 'docs' during documentation generation.
+ (chmod "src/strings.ml" #o600)
+ (and (zero? (system* "make" "docs"
+ "TEXDIRECTIVES=\\\\draftfalse"))
+ (begin
+ (for-each (lambda (f)
+ (install-file f doc))
+ (map (lambda (ext)
+ (string-append
+ "doc/unison-manual." ext))
+ '("ps" "pdf" "dvi" "html")))
+ #t))))))))
(home-page "https://www.cis.upenn.edu/~bcpierce/unison/";)
(synopsis "File synchronizer")
(description
--
2.6.3
