Removed merged packages and update coq

Julien LepillerWed Jun 07 10:26:46+0200 2017

03b878c

Removed merged packages and update coq

more/packages/ocaml.scm

7676
                         "/lib/ocaml/site-lib"))
7777
    #:phases (modify-phases %standard-phases (delete 'configure))))
7878
79-
(define-public ocaml-core-kernel
80-
  (package
81-
    (name "ocaml-core-kernel")
82-
    (version "113.33.03")
83-
    (source (janestreet-origin "core_kernel" version
84-
               "0fl23jrwivixawhxinbwaw9cabqnzn7fini7dxpxjjvkxdc8ip5y"))
85-
    (native-inputs
86-
     `(("js-build-tools" ,ocaml-js-build-tools)
87-
       ("ppx-jane" ,ocaml-ppx-jane)
88-
       ("opam" ,opam)))
89-
    (propagated-inputs
90-
     `(("bin_prot" ,ocaml-bin-prot)
91-
       ("ppx-assert" ,ocaml-ppx-assert)
92-
       ("ppx-bench" ,ocaml-ppx-bench)
93-
       ("ppx-driver" ,ocaml-ppx-driver)
94-
       ("ppx-expect" ,ocaml-ppx-expect)
95-
       ("ppx-inline-test" ,ocaml-ppx-inline-test)
96-
       ("typerep" ,ocaml-typerep)
97-
       ("sexplib" ,ocaml-sexplib)
98-
       ("variantslib" ,ocaml-variantslib)
99-
       ("result" ,ocaml-result)
100-
       ("fieldslib" ,ocaml-fieldslib)))
101-
    (build-system ocaml-build-system)
102-
    (arguments janestreet-arguments)
103-
    (home-page "https://github.com/janestreet/core_kernel/")
104-
    (synopsis "Portable standard library for OCaml")
105-
    (description "Core is an alternative to the OCaml standard library.
106-
107-
Core_kernel is the system-independent part of Core. It is aimed for cases when
108-
the full Core is not available, such as in Javascript.")
109-
    (license license:asl2.0)))
110-
111-
(define-public ocaml-async-kernel
112-
  (package
113-
    (name "ocaml-async-kernel")
114-
    (version "113.33.03")
115-
    (source (janestreet-origin "async_kernel" version
116-
              "04bjsaa23j831r09r38x6xx9nhryvp0z5ihickvhxqa4fb2snyvd"))
117-
    (native-inputs
118-
     `(("oasis" ,ocaml-oasis)
119-
       ("js-build-tools" ,ocaml-js-build-tools)
120-
       ("ppx-jane" ,ocaml-ppx-jane)
121-
       ("opam" ,opam)))
122-
    (propagated-inputs
123-
     `(("core-kernel" ,ocaml-core-kernel)))
124-
    (build-system ocaml-build-system)
125-
    (arguments janestreet-arguments)
126-
    (home-page "https://github.com/janestreet/async_kernel/")
127-
    (synopsis "Monadic concurrency library")
128-
    (description "Monadic concurrency library.")
129-
    (license license:asl2.0)))
130-
131-
(define-public ocaml-async-rpc-kernel
132-
  (package
133-
    (name "ocaml-async-rpc-kernel")
134-
    (version "113.33.03")
135-
    (source (janestreet-origin "async_rpc_kernel" version
136-
             "0y97h9pkb00v7jpf87m8cbb0ffkclj9g26ph6sq97q8dpisnkjwh"))
137-
    (native-inputs
138-
     `(("oasis" ,ocaml-oasis)
139-
       ("js-build-tools" ,ocaml-js-build-tools)
140-
       ("ppx-jane" ,ocaml-ppx-jane)
141-
       ("opam" ,opam)))
142-
    (propagated-inputs
143-
     `(("async-kernel" ,ocaml-async-kernel)))
144-
    (build-system ocaml-build-system)
145-
    (arguments janestreet-arguments)
146-
    (home-page "https://github.com/janestreet/async_rpc_kernel/")
147-
    (synopsis "Platform-independent core of Async RPC library")
148-
    (description "Platform-independent core of Async RPC library.")
149-
    (license license:asl2.0)))
150-
151-
(define-public ocaml-core
152-
  (package
153-
    (name "ocaml-core")
154-
    (version "113.33.03")
155-
    (source (janestreet-origin "core" version
156-
              "1znll157qg56g9d3247fjibv1hxv3r9wxgr4nhy19j2vzdh6a268"))
157-
    (native-inputs
158-
     `(("oasis" ,ocaml-oasis)
159-
       ("js-build-tools" ,ocaml-js-build-tools)
160-
       ("ppx-jane" ,ocaml-ppx-jane)
161-
       ("opam" ,opam)))
162-
    (propagated-inputs
163-
     `(("core-kernel" ,ocaml-core-kernel)))
164-
    (build-system ocaml-build-system)
165-
    (arguments janestreet-arguments)
166-
    (home-page "https://github.com/janestreet/core/")
167-
    (synopsis "Alternative to OCaml's standard library")
168-
    (description "The Core suite of libraries is an alternative to OCaml's
169-
standard library that was developed by Jane Street.")
170-
    (license license:asl2.0)))
171-
172-
(define-public ocaml-async-unix
173-
  (package
174-
    (name "ocaml-async-unix")
175-
    (version "113.33.03")
176-
    (source (janestreet-origin "async_unix" version
177-
              "1fwl0lfrizllcfjk8hk8m7lsz9ha2jg6qgk4gssfyz377qvpcq4h"))
178-
    (native-inputs
179-
     `(("oasis" ,ocaml-oasis)
180-
       ("js-build-tools" ,ocaml-js-build-tools)
181-
       ("ppx-jane" ,ocaml-ppx-jane)
182-
       ("opam" ,opam)))
183-
    (propagated-inputs
184-
     `(("async-kernel" ,ocaml-async-kernel)
185-
       ("core" ,ocaml-core)))
186-
    (build-system ocaml-build-system)
187-
    (arguments janestreet-arguments)
188-
    (home-page "https://github.com/janestreet/async_unix")
189-
    (synopsis "Monadic concurrency library")
190-
    (description "Monadic concurrency library.")
191-
    (license license:asl2.0)))
192-
193-
(define-public ocaml-async-extra
194-
  (package
195-
    (name "ocaml-async-extra")
196-
    (version "113.33.03")
197-
    (source (janestreet-origin "async_extra" version
198-
              "1si8jgiq5xh5sl9f2b7f9p17p7zx5h1pg557x2cxywi2x7pxqg4f"))
199-
    (native-inputs
200-
     `(("oasis" ,ocaml-oasis)
201-
       ("js-build-tools" ,ocaml-js-build-tools)
202-
       ("ppx-jane" ,ocaml-ppx-jane)
203-
       ("opam" ,opam)))
204-
    (propagated-inputs
205-
     `(("async-rpc-kernel" ,ocaml-async-rpc-kernel)
206-
       ("async-unix" ,ocaml-async-unix)
207-
       ("core" ,ocaml-core)))
208-
    (build-system ocaml-build-system)
209-
    (arguments janestreet-arguments)
210-
    (home-page "https://github.com/janestreet/async_extra")
211-
    (synopsis "Monadic concurrency library")
212-
    (description "Monadic concurrency library.")
213-
    (license license:asl2.0)))
214-
215-
(define-public ocaml-async
216-
  (package
217-
    (name "ocaml-async")
218-
    (version "113.33.03")
219-
    (source (janestreet-origin "async" version
220-
              "0210fyhcs12kpmmd26015bgivkfd2wqkyn3c5wd7688d0f872y25"))
221-
    (native-inputs
222-
     `(("oasis" ,ocaml-oasis)
223-
       ("js-build-tools" ,ocaml-js-build-tools)
224-
       ("ppx-jane" ,ocaml-ppx-jane)
225-
       ("opam" ,opam)))
226-
    (propagated-inputs
227-
     `(("async-extra" ,ocaml-async-extra)))
228-
    (build-system ocaml-build-system)
229-
    (arguments janestreet-arguments)
230-
    (home-page "https://github.com/janestreet/async")
231-
    (synopsis "Monadic concurrency library")
232-
    (description "Monadic concurrency library.")
233-
    (license license:asl2.0)))
234-
235-
(define-public ocaml-ocplib-endian
236-
  (package
237-
    (name "ocaml-ocplib-endian")
238-
    (version "1.0")
239-
    (source (origin
240-
              (method url-fetch)
241-
              (uri (string-append "https://github.com/OCamlPro/ocplib-endian/"
242-
                                  "archive/" version ".tar.gz"))
243-
              (sha256
244-
               (base32
245-
                "0hwj09rnzjs0m0kazz5h2mgs6p95j0zlga8cda5srnzqmzhniwkn"))
246-
              (file-name (string-append name "-" version ".tar.gz"))))
247-
    (build-system ocaml-build-system)
248-
    (native-inputs `(("cppo" ,ocaml-cppo)))
249-
    (home-page "https://github.com/OCamlPro/ocplib-endian")
250-
    (synopsis "Optimised functions to read and write int16/32/64 from strings
251-
and bigarrays")
252-
    (description "Optimised functions to read and write int16/32/64 from strings
253-
and bigarrays, based on new primitives added in version 4.01. It works on
254-
strings, bytes and bigstring (Bigarrys of chars), and provides submodules for
255-
big- and little-endian, with their unsafe counter-parts.")
256-
    (license license:lgpl2.1)))
257-
258-
(define-public ocaml-cstruct
259-
  (package
260-
    (name "ocaml-cstruct")
261-
    (version "2.3.1")
262-
    (source (origin
263-
              (method url-fetch)
264-
              (uri (string-append "https://github.com/mirage/ocaml-cstruct/"
265-
                                  "archive/v" version ".tar.gz"))
266-
              (sha256
267-
               (base32
268-
                "15qpdc8421shq4pprdas9jznpva45229wkfqbwcxw9khaiiz7949"))
269-
              (file-name (string-append name "-" version ".tar.gz"))))
270-
    (build-system ocaml-build-system)
271-
    (arguments
272-
     `(#:configure-flags
273-
       (list "--enable-lwt" "--enable-async")
274-
       #:phases
275-
       (modify-phases %standard-phases
276-
         (add-after 'install 'link-stubs
277-
           (lambda* (#:key outputs #:allow-other-keys)
278-
             (let* ((out (assoc-ref outputs "out"))
279-
                    (stubs (string-append out "/lib/ocaml/site-lib/stubslibs"))
280-
                    (lib (string-append out "/lib/ocaml/site-lib/cstruct")))
281-
               (mkdir-p stubs)
282-
               (symlink (string-append lib "/dllcstruct_stubs.so")
283-
                        (string-append stubs "/dllcstruct_stubs.so"))))))))
284-
    (native-inputs
285-
     `(("ounit" ,ocaml-ounit)
286-
       ("ppx-tools" ,ocaml-ppx-tools)
287-
       ("camlp4" ,camlp4)))
288-
    (propagated-inputs
289-
     `(("ocplib-endian" ,ocaml-ocplib-endian)
290-
       ("lwt" ,ocaml-lwt)
291-
       ("async" ,ocaml-async)
292-
       ("sexplib" ,ocaml-sexplib)))
293-
    (home-page "https://github.com/mirage/ocaml-cstruct")
294-
    (synopsis "Access C structures via a camlp4 extension")
295-
    (description "Cstruct is a library and syntax extension to make it easier
296-
to access C-like structures directly from OCaml.  It supports both reading and
297-
writing to these structures, and they are accessed via the Bigarray module.")
298-
    (license license:isc)))
299-
300-
(define-public ocaml-hex
301-
  (package
302-
    (name "ocaml-hex")
303-
    (version "1.0.0")
304-
    (source (origin
305-
              (method url-fetch)
306-
              (uri (string-append "https://github.com/mirage/ocaml-hex/"
307-
                                  "archive/" version ".tar.gz"))
308-
              (sha256
309-
               (base32
310-
                "0s63g0b8gfv2xm6fv6xg7bva8h76b5pcjb0zw3f8cygs0lq9072v"))
311-
              (file-name (string-append name "-" version ".tar.gz"))))
312-
    (build-system ocaml-build-system)
313-
    (propagated-inputs `(("cstruct" ,ocaml-cstruct)))
314-
    (home-page "https://github.com/mirage/ocaml-hex/")
315-
    (synopsis "Minimal library providing hexadecimal converters")
316-
    (description "Minimal library providing hexadecimal converters.")
317-
    (license license:isc)))
318-
31979
(define-public ocaml-ezjsonm
32080
  (package
32181
    (name "ocaml-ezjsonm")

909669
    (native-inputs
910670
     `(("ocaml" ,ocaml)
911671
       ("which" ,which)
912-
       ("coq" ,coq)))
672+
       ("coq" ,coq-fix)))
913673
    (arguments
914674
     `(#:configure-flags
915675
       (list (string-append "--libdir=" (assoc-ref %outputs "out")

954714
    (native-inputs
955715
     `(("ocaml" ,ocaml)
956716
       ("which" ,which)
957-
       ("coq" ,coq)
717+
       ("coq" ,coq-fix)
958718
       ("bison" ,bison)
959719
       ("flex" ,flex)))
960720
    (inputs

1006766
    (native-inputs
1007767
     `(("ocaml" ,ocaml)
1008768
       ("which" ,which)
1009-
       ("coq" ,coq)))
769+
       ("coq" ,coq-fix)))
1010770
    (arguments
1011771
     `(#:tests? #f; No need to test formally-verified programs :)
1012772
       #:phases

1133893
  (package
1134894
    (inherit coq)
1135895
    (name "coq-fix")
896+
    (version "8.6")
897+
    (source (origin
898+
              (method url-fetch)
899+
              (uri (string-append "https://coq.inria.fr/distrib/V" version
900+
                                  "/files/coq-" version ".tar.gz"))
901+
              (sha256
902+
               (base32
903+
                "1pw1xvy1657l1k69wrb911iqqflzhhp8wwsjvihbgc72r3skqg3f"))))
1136904
    (native-search-paths
1137905
      (list (search-path-specification
1138906
              (variable "COQPATH")