moved patches to proper location and fixed ocaml-ppx-assert

Julien LepillerTue Feb 28 23:57:44+0100 2017

653faea

moved patches to proper location and fixed ocaml-ppx-assert

more/packages/ocaml.scm

193193 
        (inherit (janestreet-origin "ppx_assert" version
194194 
                   "1k5kxmqkibp5fk25pgz81f3c1r4mgvb5byzf6bnmxd24y60wn46p"))
195195 
        (modules '((guix build utils)))
196-
        (snippet `(substitute* "install.ml"
197-
                               (("lib/ppx_assert")
198-
                                "lib/ocaml/site-lib/ppx_assert")))))
196+
        (snippet
197+
         (let ((pattern (string-append "lib/" name)))
198+
           `(begin
199+
              ;; install.ml contains an invalid reference to the ppx file and
200+
              ;; propagates this error to the generated META file.  It
201+
              ;; looks for it in the "lib" directory, but it is installed in
202+
              ;; "lib/ocaml/site-lib/package".  This substitute does not change
203+
              ;; this file for non ppx packages.
204+
              (substitute* "install.ml"
205+
                ((,pattern) (string-append "lib/ocaml/site-lib/" ,name)))
206+
              ;; The standard Makefile would try to install janestreet modules
207+
              ;; in OCaml's directory in the store, which is read-only.
208+
              (substitute* "Makefile"
209+
                (("--prefix")
210+
                 "--libdir $(LIBDIR) --prefix"))
211+
              (substitute* "install.ml"
212+
                           (("lib/ppx_assert")
213+
                            "lib/ocaml/site-lib/ppx_assert")))))))
199214 
    (build-system ocaml-build-system)
200215 
    (native-inputs
201216 
     `(("js-build-tools" ,ocaml-js-build-tools)

more/packages/patches/ocaml-piqilib-fix-makefile.patch unknown status 2

1-
From 336e69d6882a1b8d725c43f1c2e340ef4464bac5 Mon Sep 17 00:00:00 2001
2-
From: Julien Lepiller <julien@lepiller.eu>
3-
Date: Sat, 31 Dec 2016 11:21:14 +0100
4-
Subject: [PATCH] fix OCAMLPATH in makefile
5-
6-
---
7-
 Makefile            | 2 +-
8-
 make/Makefile.ocaml | 3 ++-
9-
 2 files changed, 3 insertions(+), 2 deletions(-)
10-
11-
diff --git a/Makefile b/Makefile
12-
index 4db87da..9315887 100644
13-
--- a/Makefile
14-
+++ b/Makefile
15-
@@ -23,7 +23,7 @@ OCAMLFIND_DESTDIR := $(shell cygpath -w $(OCAMLFIND_DESTDIR))
16-
 endif
17-
 export OCAMLFIND_DESTDIR
18-
19-
-OCAMLPATH := $(PIQI_ROOT)/deps
20-
+OCAMLPATH := $(OCAMLPATH):$(PIQI_ROOT)/deps
21-
 ifeq ($(SYSTEM),$(filter $(SYSTEM),mingw mingw64))
22-
 OCAMLPATH := $(shell cygpath -w $(OCAMLPATH))
23-
 endif
24-
diff --git a/make/Makefile.ocaml b/make/Makefile.ocaml
25-
index 2b6324d..b82c041 100644
26-
--- a/make/Makefile.ocaml
27-
+++ b/make/Makefile.ocaml
28-
@@ -1,7 +1,7 @@
29-
 OCAMLMAKEFILE := $(PIQI_ROOT)/make/OCamlMakefile
30-
31-
32-
-OCAMLPATH := $(PIQI_BUILD)/lib/ocaml
33-
+OCAMLPATH := $(OCAMLPATH):$(PIQI_BUILD)/lib/ocaml
34-
 ifeq ($(SYSTEM),$(filter $(SYSTEM),mingw mingw64))
35-
 OCAMLPATH := $(shell cygpath -w $(OCAMLPATH))
36-
 endif
37-
@@ -23,6 +23,7 @@ post_target::
38-
39-
40-
 .ml.mli: $(EXTRADEPS)
41-
+			echo $(OCAMLPATH)
42-
 			$(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $<`; \
43-
 			if [ -z "$$pp" ]; then \
44-
 			  $(ECHO) $(REAL_OCAMLFIND) $(INTF_OCAMLC) $(OCAML_FIND_PACKAGES) \
45-
--
46-
2.11.0
47-
more/packages/patches/ocamlgraph-honor-source-date-epoch.patch unknown status 2
1-
From 354ef78aac0b887fae3c10b28eb2b0d83f66bdfe Mon Sep 17 00:00:00 2001
2-
From: Julien Lepiller <julien@lepiller.eu>
3-
Date: Mon, 2 Jan 2017 17:05:24 +0100
4-
Subject: [PATCH] Honor SOURCE_DATE_EPOCH
5-
6-
---
7-
 Makefile.in | 7 ++++++-
8-
 1 file changed, 6 insertions(+), 1 deletion(-)
9-
10-
diff --git a/Makefile.in b/Makefile.in
11-
index a32b4b8..ef4c174 100644
12-
--- a/Makefile.in
13-
+++ b/Makefile.in
14-
@@ -113,11 +113,16 @@ graph.cmx: $(CMI) $(CMX)
15-
	$(OCAMLOPT) $(INCLUDES) -pack -o $@ $^
16-
 
17-
 VERSION=1.8.7
18-
+ifdef SOURCE_DATE_EPOCH
19-
+BUILD_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" 2>/dev/null || date)
20-
+else
21-
+BUILD_DATE=$(shell date)
22-
+endif
23-
 
24-
 src/version.ml: Makefile
25-
	rm -f $@
26-
	echo "let version = \""$(VERSION)"\"" > $@
27-
-	echo "let date = \""`date`"\"" >> $@
28-
+	echo "let date = \""$(BUILD_DATE)"\"" >> $@
29-
 
30-
 # gtk2 graph editor
31-
 ###################
32-
-- 
33-
2.11.0
34-
ocaml-piqilib-fix-makefile.patch unknown status 1
1+
From 336e69d6882a1b8d725c43f1c2e340ef4464bac5 Mon Sep 17 00:00:00 2001
2+
From: Julien Lepiller <julien@lepiller.eu>
3+
Date: Sat, 31 Dec 2016 11:21:14 +0100
4+
Subject: [PATCH] fix OCAMLPATH in makefile
5+
6+
---
7+
 Makefile            | 2 +-
8+
 make/Makefile.ocaml | 3 ++-
9+
 2 files changed, 3 insertions(+), 2 deletions(-)
10+
11+
diff --git a/Makefile b/Makefile
12+
index 4db87da..9315887 100644
13+
--- a/Makefile
14+
+++ b/Makefile
15+
@@ -23,7 +23,7 @@ OCAMLFIND_DESTDIR := $(shell cygpath -w $(OCAMLFIND_DESTDIR))
16+
 endif
17+
 export OCAMLFIND_DESTDIR
18+
19+
-OCAMLPATH := $(PIQI_ROOT)/deps
20+
+OCAMLPATH := $(OCAMLPATH):$(PIQI_ROOT)/deps
21+
 ifeq ($(SYSTEM),$(filter $(SYSTEM),mingw mingw64))
22+
 OCAMLPATH := $(shell cygpath -w $(OCAMLPATH))
23+
 endif
24+
diff --git a/make/Makefile.ocaml b/make/Makefile.ocaml
25+
index 2b6324d..b82c041 100644
26+
--- a/make/Makefile.ocaml
27+
+++ b/make/Makefile.ocaml
28+
@@ -1,7 +1,7 @@
29+
 OCAMLMAKEFILE := $(PIQI_ROOT)/make/OCamlMakefile
30+
31+
32+
-OCAMLPATH := $(PIQI_BUILD)/lib/ocaml
33+
+OCAMLPATH := $(OCAMLPATH):$(PIQI_BUILD)/lib/ocaml
34+
 ifeq ($(SYSTEM),$(filter $(SYSTEM),mingw mingw64))
35+
 OCAMLPATH := $(shell cygpath -w $(OCAMLPATH))
36+
 endif
37+
@@ -23,6 +23,7 @@ post_target::
38+
39+
40+
 .ml.mli: $(EXTRADEPS)
41+
+			echo $(OCAMLPATH)
42+
 			$(QUIET)pp=`sed -n -e '/^#/d' -e 's/(\*pp \([^*]*\) \*)/\1/p;q' $<`; \
43+
 			if [ -z "$$pp" ]; then \
44+
 			  $(ECHO) $(REAL_OCAMLFIND) $(INTF_OCAMLC) $(OCAML_FIND_PACKAGES) \
45+
--
46+
2.11.0
47+
ocamlgraph-honor-source-date-epoch.patch unknown status 1
1+
From 354ef78aac0b887fae3c10b28eb2b0d83f66bdfe Mon Sep 17 00:00:00 2001
2+
From: Julien Lepiller <julien@lepiller.eu>
3+
Date: Mon, 2 Jan 2017 17:05:24 +0100
4+
Subject: [PATCH] Honor SOURCE_DATE_EPOCH
5+
6+
---
7+
 Makefile.in | 7 ++++++-
8+
 1 file changed, 6 insertions(+), 1 deletion(-)
9+
10+
diff --git a/Makefile.in b/Makefile.in
11+
index a32b4b8..ef4c174 100644
12+
--- a/Makefile.in
13+
+++ b/Makefile.in
14+
@@ -113,11 +113,16 @@ graph.cmx: $(CMI) $(CMX)
15+
	$(OCAMLOPT) $(INCLUDES) -pack -o $@ $^
16+
 
17+
 VERSION=1.8.7
18+
+ifdef SOURCE_DATE_EPOCH
19+
+BUILD_DATE=$(shell date -u -d "@$(SOURCE_DATE_EPOCH)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" 2>/dev/null || date)
20+
+else
21+
+BUILD_DATE=$(shell date)
22+
+endif
23+
 
24+
 src/version.ml: Makefile
25+
	rm -f $@
26+
	echo "let version = \""$(VERSION)"\"" > $@
27+
-	echo "let date = \""`date`"\"" >> $@
28+
+	echo "let date = \""$(BUILD_DATE)"\"" >> $@
29+
 
30+
 # gtk2 graph editor
31+
 ###################
32+
-- 
33+
2.11.0
34+