[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#33079] [PATCH 30/34] gnu: Update ocaml-bitstring to 3.1.0.
From: |
Julien Lepiller |
Subject: |
[bug#33079] [PATCH 30/34] gnu: Update ocaml-bitstring to 3.1.0. |
Date: |
Wed, 17 Oct 2018 22:34:38 +0200 |
* gnu/packages/ocaml.scm (ocaml-bitstring): Update to 3.1.0.
(ocaml4.02-bitstring): New variable.
---
gnu/packages/ocaml.scm | 98 ++++++++++++++++++++++++++++++------------
1 file changed, 71 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 76d18ed3d..0c78651c5 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1577,27 +1577,69 @@ ocaml-migrate-parsetree")
(define-public ocaml-bitstring
(package
(name "ocaml-bitstring")
- (version "2.1.1")
+ (version "3.1.0")
(source (origin
(method url-fetch)
- (uri (string-append "https://github.com/xguerin/bitstring"
- "/archive/v" version ".tar.gz"))
+ (uri (string-append
"https://bitbucket.org/thanatonauts/bitstring/"
+ "get/v" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "0vy8ibrxccii1jbsk5q6yh1kxjigqvi7lhhcmizvd5gfhf7mfyc8"))
- (patches (search-patches
"ocaml-bitstring-fix-configure.patch"))))
+ "15jjk2pq1vx311gl49s5ag6x5y0654x35w75z07g7kr2q334hqps"))))
(build-system ocaml-build-system)
(native-inputs
`(("camlp4" ,camlp4)
("time" ,time)
("autoconf" ,autoconf)
("automake" ,automake)
- ("bisect" ,ocaml-bisect)))
+ ("bisect" ,ocaml-bisect)
+ ("dune" ,dune)))
(propagated-inputs
- `(("camlp4" ,camlp4)))
+ `(("camlp4" ,camlp4)
+ ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned)))
(arguments
- `(#:configure-flags
+ `(#:tests? #f; Tests fail to build
+ #:phases
+ (modify-phases %standard-phases
+ (delete 'configure)
+ (replace 'build
+ (lambda _
+ (invoke "jbuilder" "build" "@install")
+ #t))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (invoke "dune" "install"
+ "--prefix" (assoc-ref outputs "out"))
+ #t)))))
+ (properties
+ `((ocaml4.02-variant . ,(delay ocaml4.02-bitstring))))
+ (home-page "https://github.com/xguerin/bitstring")
+ (synopsis "Bitstrings and bitstring matching for OCaml")
+ (description "Adds Erlang-style bitstrings and matching over bitstrings as
+a syntax extension and library for OCaml. You can use this module to both
parse
+and generate binary formats, files and protocols. Bitstring handling is added
+as primitives to the language, making it exceptionally simple to use and very
+powerful.")
+ (license license:isc)))
+
+(define-public ocaml4.02-bitstring
+ (let ((base (package-with-ocaml4.02 (strip-ocaml4.02-variant
ocaml-bitstring))))
+ (package
+ (inherit base)
+ (version "2.1.1")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/xguerin/bitstring"
+ "/archive/v" version ".tar.gz"))
+ (file-name (string-append "ocaml-bitstring-" version
".tar.gz"))
+ (sha256
+ (base32
+ "0vy8ibrxccii1jbsk5q6yh1kxjigqvi7lhhcmizvd5gfhf7mfyc8"))
+ (patches (search-patches
"ocaml-bitstring-fix-configure.patch"))))
+ (arguments
+ `(#:ocaml ,ocaml-4.02
+ #:findlib ,ocaml4.02-findlib
+ #:configure-flags
(list "CAMLP4OF=camlp4of" "--enable-coverage")
#:make-flags
(list (string-append "BISECTLIB="
@@ -1613,6 +1655,17 @@ ocaml-migrate-parsetree")
"$(BISECTLIB)/bisect"))
#:phases
(modify-phases %standard-phases
+ (add-after 'install 'link-lib
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (stubs (string-append out
+ "/lib/ocaml/site-lib/stubslibs"))
+ (lib (string-append out
+ "/lib/ocaml/site-lib/bitstring")))
+ (mkdir-p stubs)
+ (symlink (string-append lib "/dllbitstring.so")
+ (string-append stubs "/dllbitstring.so")))
+ #t))
(add-before 'configure 'fix-configure
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "Makefile.in"
@@ -1620,25 +1673,16 @@ ocaml-migrate-parsetree")
(string-append "@abs_top_builddir@:" (getenv "LIBRARY_PATH"))))
(substitute* "configure"
(("-/bin/sh") (string-append "-" (assoc-ref inputs "bash")
- "/bin/sh")))))
- (add-after 'install 'link-lib
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (stubs (string-append out
- "/lib/ocaml/site-lib/stubslibs"))
- (lib (string-append out
- "/lib/ocaml/site-lib/bitstring")))
- (mkdir-p stubs)
- (symlink (string-append lib "/dllbitstring.so")
- (string-append stubs "/dllbitstring.so"))))))))
- (home-page "https://github.com/xguerin/bitstring")
- (synopsis "Bitstrings and bitstring matching for OCaml")
- (description "Adds Erlang-style bitstrings and matching over bitstrings as
-a syntax extension and library for OCaml. You can use this module to both
parse
-and generate binary formats, files and protocols. Bitstring handling is added
-as primitives to the language, making it exceptionally simple to use and very
-powerful.")
- (license license:isc)))
+ "/bin/sh")))
+ #t)))))
+ (native-inputs
+ `(("camlp4" ,camlp4-4.02)
+ ("time" ,time)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("bisect" ,ocaml4.02-bisect)))
+ (propagated-inputs
+ `(("camlp4" ,camlp4-4.02))))))
(define-public ocaml-result
(package
--
2.18.0
- [bug#33079] [PATCH 06/34] guix: ocaml: Add package-with-ocaml4.02., (continued)
- [bug#33079] [PATCH 06/34] guix: ocaml: Add package-with-ocaml4.02., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 13/34] gnu: opam: Update to 2.0.0., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 09/34] gnu: camlp5: Update to 7.06., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 19/34] gnu: ocmalmod: Update to 0.0.9., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 20/34] gnu: Add ocaml4.02-zarith., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 23/34] gnu: Fix ocaml-qtest., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 25/34] gnu: ocaml-bisect: Update to 1.3.1., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 26/34] gnu: ocaml-bisect: Update to 1.3.1., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 28/34] gnu: Add ocaml-migrate-parsetree., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 30/34] gnu: Update ocaml-bitstring to 3.1.0.,
Julien Lepiller <=
- [bug#33079] [PATCH 31/34] gnu: Add ocaml4.02-result., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 33/34] gnu: Fix ocaml-rresult., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 29/34] gnu: Add ocaml-ppx-tools-versioned., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 32/34] gnu: Fix ocaml-topkg., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 21/34] gnu: Fix ocaml-frontc., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 16/34] gnu: unison: Build with ocaml-4.02., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 18/34] gnu: Add ocaml4.02-camlzip., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 24/34] gnu: Fix ocaml-stringext., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 27/34] gnu: Add dune., Julien Lepiller, 2018/10/17
- [bug#33079] [PATCH 34/34] gnu: Update ocaml packages., Julien Lepiller, 2018/10/17