me
/
guix
Archived
1
0
Fork 0
Code

gnu: Add ocaml-piqilib. 

* gnu/packages/ocaml.scm (ocaml4.07-piqilib): Rename to...
(ocaml-piqilib): ...this.  Use latest ocaml version.
Julien Lepiller 2022-06-18 12:55:43 +02:00
parent 0133c000c9
commit 4a94cfbe4d
No known key found for this signature in database
GPG Key ID: 53D457B2D636EE82
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gnu/packages/ocaml.scm
View File

@ -3828,9 +3828,9 @@ JSON.")
Format module of the OCaml standard library.") Format module of the OCaml standard library.")
(license license:bsd-3))) (license license:bsd-3)))
(define-public ocaml4.07-piqilib (define-public ocaml-piqilib
(package (package
(name "ocaml4.07-piqilib") (name "ocaml-piqilib")
(version "0.6.15") (version "0.6.15")
(source (source
(origin (origin
@ -3848,24 +3848,20 @@ Format module of the OCaml standard library.")
(add-before 'configure 'fix-ocamlpath (add-before 'configure 'fix-ocamlpath
(lambda _ (lambda _
(substitute* '("Makefile" "make/Makefile.ocaml") (substitute* '("Makefile" "make/Makefile.ocaml")
(("OCAMLPATH := ") "OCAMLPATH := $(OCAMLPATH):")) (("OCAMLPATH := ") "OCAMLPATH := $(OCAMLPATH):"))))
#t))
(replace 'configure (replace 'configure
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* "make/OCamlMakefile" (substitute* "make/OCamlMakefile"
(("/bin/sh") (which "bash"))) (("/bin/sh") (which "bash")))
(invoke "./configure" "--prefix" out "--ocaml-libdir" (invoke "./configure" "--prefix" out "--ocaml-libdir"
(string-append out "/lib/ocaml/site-lib"))) (string-append out "/lib/ocaml/site-lib")))))
#t))
(add-after 'build 'build-ocaml (add-after 'build 'build-ocaml
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "ocaml") (invoke "make" "ocaml")))
#t))
(add-after 'install 'install-ocaml (add-after 'install 'install-ocaml
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "ocaml-install") (invoke "make" "ocaml-install")))
#t))
(add-after 'install-ocaml 'link-stubs (add-after 'install-ocaml 'link-stubs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -3873,17 +3869,14 @@ Format module of the OCaml standard library.")
(lib (string-append out "/lib/ocaml/site-lib/piqilib"))) (lib (string-append out "/lib/ocaml/site-lib/piqilib")))
(mkdir-p stubs) (mkdir-p stubs)
(symlink (string-append lib "/dllpiqilib_stubs.so") (symlink (string-append lib "/dllpiqilib_stubs.so")
(string-append stubs "/dllpiqilib_stubs.so")) (string-append stubs "/dllpiqilib_stubs.so"))))))))
#t))))
#:ocaml ,ocaml-4.07
#:findlib ,ocaml4.07-findlib))
(native-inputs (native-inputs
(list which)) (list which))
(propagated-inputs (propagated-inputs
`(("ocaml-xmlm" ,(package-with-ocaml4.07 ocaml-xmlm)) `(("ocaml-xmlm" ,ocaml-xmlm)
("ocaml-sedlex" ,(package-with-ocaml4.07 ocaml-sedlex)) ("ocaml-sedlex" ,ocaml-sedlex)
("ocaml-easy-format" ,(package-with-ocaml4.07 ocaml-easy-format)) ("ocaml-easy-format" ,ocaml-easy-format)
("ocaml-base64" ,(package-with-ocaml4.07 ocaml-base64)))) ("ocaml-base64" ,ocaml-base64)))
(home-page "http://piqi.org") (home-page "http://piqi.org")
(synopsis "Data serialization and conversion library") (synopsis "Data serialization and conversion library")
(description "Piqilib is the common library used by the piqi command-line (description "Piqilib is the common library used by the piqi command-line
@ -3996,7 +3989,7 @@ and 4 (random based) according to RFC 4122.")
(list which protobuf)) ; for tests (list which protobuf)) ; for tests
(propagated-inputs (propagated-inputs
`(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num)) `(("ocaml-num" ,(package-with-ocaml4.07 ocaml-num))
("ocaml-piqilib" ,ocaml4.07-piqilib) ("ocaml-piqilib" ,(package-with-ocaml4.07 ocaml-piqilib))
("ocaml-stdlib-shims" ,(package-with-ocaml4.07 ocaml-stdlib-shims)))) ("ocaml-stdlib-shims" ,(package-with-ocaml4.07 ocaml-stdlib-shims))))
(home-page "https://github.com/alavrik/piqi-ocaml") (home-page "https://github.com/alavrik/piqi-ocaml")
(synopsis "Protocol serialization system for OCaml") (synopsis "Protocol serialization system for OCaml")