Use ocaml-fix in updated coq, compcert and more

LEPILLER JulienMon Oct 23 15:54:19+0200 2017

56a2ef9

Use ocaml-fix in updated coq, compcert and more

more/packages/ocaml.scm

3737 
  #:use-module (gnu packages multiprecision)
3838 
  #:use-module (gnu packages ocaml)
3939 
  #:use-module (gnu packages perl)
40+
  #:use-module (gnu packages pkg-config)
4041 
  #:use-module (gnu packages protobuf)
4142 
  #:use-module (gnu packages python)
43+
  #:use-module (gnu packages tex)
4244 
  #:use-module (gnu packages texinfo)
4345 
  #:use-module (more packages smt))
4446 
…
316318 
provers.")
317319 
    (license license:gpl2+)))
318320 
319-
(define-public ocaml-findlib-fix
320-
  (package
321-
    (inherit ocaml-findlib)
322-
    (native-inputs
323-
     `(("camlp4" ,camlp4)
324-
       ("ocaml" ,ocaml-fix)
325-
       ("m4" ,m4)))))
326-
327321 
(define-public ocaml-build
328322 
  (package
329323 
    (name "ocaml-build")
…
359353 
               (setenv "OCAMLFIND_LDCONF" "ignore")
360354 
               #t))))))
361355 
    (native-inputs
362-
     `(("ocaml" ,ocaml-fix)
363-
       ("findlib" ,ocaml-findlib-fix)))
356+
     `(("ocaml" ,ocaml-fix)))
364357 
    (home-page "")
365358 
    (synopsis "")
366359 
    (description "")
367360 
    (license license:lgpl2.1+)))
368361 
362+
(define-public camlp4-fix
363+
  (package
364+
    (inherit camlp4)
365+
    (name "camlp4")
366+
    (version "4.05+2")
367+
    (source (origin
368+
              (method url-fetch)
369+
              (uri (string-append "https://github.com/ocaml/camlp4/archive/"
370+
								  version ".tar.gz"))
371+
              (file-name (string-append name "-" version ".tar.gz"))
372+
              (sha256
373+
               (base32
374+
			    "0dd9scf50y0928syvxflljwry2dzm35n903fgpfdkpcn907jq96v"))))
375+
    (inputs `(("ocaml" ,ocaml-fix)))
376+
    (native-inputs
377+
     `(("ocaml" ,ocaml-fix)
378+
       ("which" ,which)
379+
       ("build" ,ocaml-build)))))
380+
381+
(define-public ocaml-findlib-fix
382+
  (package
383+
    (inherit ocaml-findlib)
384+
    (native-inputs
385+
     `(("camlp4" ,camlp4-fix)
386+
       ("ocaml" ,ocaml-fix)
387+
       ("m4" ,m4)))))
388+
389+
(define-public camlp5-fix
390+
  (package
391+
    (inherit camlp5)
392+
    (name "camlp5")
393+
    (version "7.03")
394+
    (source (origin
395+
              (method url-fetch)
396+
              (uri (string-append "https://github.com/camlp5/camlp5/archive/rel"
397+
                                  (string-delete #\. version) ".tar.gz"))
398+
              (sha256
399+
               (base32
400+
                "06pj7l75r586gngam7nspd1a13ay7cj2bjh035z64w4fgaahlgf1"))))
401+
    (inputs
402+
     `(("ocaml" ,ocaml-fix)))))
403+
404+
(define-public lablgtk-fix
405+
  (package
406+
    (inherit lablgtk)
407+
    (native-inputs
408+
     `(("ocaml" ,ocaml-fix)
409+
       ("build" ,ocaml-build)
410+
       ("camlp4" ,camlp4-fix)
411+
       ("findlib" ,ocaml-findlib-fix)
412+
       ("pkg-config" ,pkg-config)))))
413+
369414 
(define-public ocaml-menhir-fix
370415 
  (package
371416 
    (inherit ocaml-menhir)
…
383428 
     `(("ocaml" ,ocaml-fix)
384429 
       ("ocamlbuild" ,ocaml-build)))))
385430 
431+
(define-public coq-fix
432+
  (package
433+
    (inherit coq)
434+
    (native-inputs
435+
     `(("ocamlbuild" ,ocaml-build)
436+
       ("hevea" ,hevea)
437+
       ("texlive" ,texlive)))
438+
    (inputs
439+
     `(("lablgtk" ,lablgtk-fix)
440+
       ("python" ,python-2)
441+
       ("camlp5" ,camlp5-fix)))
442+
    (arguments
443+
     `(#:ocaml ,ocaml-fix
444+
       #:findlib ,ocaml-findlib-fix
445+
       ,@(package-arguments coq)))))
446+
386447 
(define-public compcert
387448 
  (package
388449 
    (name "compcert")
…
404465 
                             (assoc-ref outputs "out"))))))
405466 
       #:tests? #f))
406467 
    (native-inputs
407-
     `(("ocaml" ,ocaml)
408-
       ("coq" ,coq)))
468+
     `(("ocaml" ,ocaml-fix)
469+
       ("coq" ,coq-fix)))
409470 
    (inputs
410471 
     `(("menhir" ,ocaml-menhir-fix)))
411472 
    (home-page "http://compcert.inria.fr")