* gnu/packages/ocaml.scm (ocamlgraph): New variable. * gnu/packages/patches/ocamlgraph-honor-source-date-epoch.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch. --- gnu/local.mk | 1 + gnu/packages/ocaml.scm | 27 +++++++++++++++++ .../ocamlgraph-honor-source-date-epoch.patch | 34 ++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 gnu/packages/patches/ocamlgraph-honor-source-date-epoch.patch
diff --git a/gnu/local.mk b/gnu/local.mk index ba04b9648..642334779 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -758,6 +758,7 @@ dist_patch_DATA = \ %D%/packages/patches/ocaml-janestreet-fix-libdir.patch \ %D%/packages/patches/ocaml-omake-fix-non-determinism.patch \ %D%/packages/patches/ocaml-piqilib-fix-makefile.patch \ + %D%/packages/patches/ocamlgraph-honor-source-date-epoch.patch \ %D%/packages/patches/ola-readdir-r.patch \ %D%/packages/patches/openexr-missing-samples.patch \ %D%/packages/patches/openjpeg-CVE-2016-5157.patch \ diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 13ab37491..9b13c22b6 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -2864,3 +2864,30 @@ the OCaml standard library.") unique identifiers version 3, 5 (named based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122.") (license license:isc))) + +(define-public ocamlgraph + (package + (name "ocamlgraph") + (version "1.8.7") + (home-page "http://ocamlgraph.lri.fr/") + (source + (origin + (method url-fetch) + (uri (string-append "http://ocamlgraph.lri.fr/download/ocamlgraph-" + version ".tar.gz")) + (sha256 (base32 + "1845r537swjil2fcj7lgbibc2zybfwqqasrd2s7bncajs83cl1nz")) + (patches (search-patches "ocamlgraph-honor-source-date-epoch.patch")))) + (build-system ocaml-build-system) + (arguments `(#:install-target "install-findlib" + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-/bin/sh + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "configure" + (("-/bin/sh") (string-append "-" (assoc-ref inputs "bash") + "/bin/sh")))))))) + (inputs `(("lablgtk" ,lablgtk))) + (synopsis "A generic graph library for OCaml") + (description "A generic graph library for OCaml.") + (license license:lgpl2.1))) diff --git a/gnu/packages/patches/ocamlgraph-honor-source-date-epoch.patch b/gnu/packages/patches/ocamlgraph-honor-source-date-epoch.patch new file mode 100644 index 000000000..9f8713e3d --- /dev/null +++ b/gnu/packages/patches/ocamlgraph-honor-source-date-epoch.patch @@ -0,0 +1,34 @@ +From 354ef78aac0b887fae3c10b28eb2b0d83f66bdfe Mon Sep 17 00:00:00 2001 +From: Julien Lepiller <jul...@lepiller.eu> +Date: Mon, 2 Jan 2017 17:05:24 +0100 +Subject: [PATCH] Honor SOURCE_DATE_EPOCH + +--- + Makefile.in | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index a32b4b8..ef4c174 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -113,11 +113,16 @@ graph.cmx: $(CMI) $(CMX) + $(OCAMLOPT) $(INCLUDES) -pack -o $@ $^ + + VERSION=1.8.7 ++ifdef SOURCE_DATE_EPOCH ++BUILD_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" 2>/dev/null || date) ++else ++BUILD_DATE=$(shell date) ++endif + + src/version.ml: Makefile + rm -f $@ + echo "let version = \""$(VERSION)"\"" > $@ +- echo "let date = \""`date`"\"" >> $@ ++ echo "let date = \""$(BUILD_DATE)"\"" >> $@ + + # gtk2 graph editor + ################### +-- +2.11.0 + -- 2.11.0