01/08: gnu: ocaml-bitsring: Update to 4.1.0.

[guix-commits]

roptat pushed a commit to branch master
in repository guix.

commit 718700cc95c1d17dbbde45af8c115a361edacb0e
Author: Julien Lepiller <julien@lepiller.eu>
AuthorDate: Sat Nov 20 01:12:45 2021 +0100

    gnu: ocaml-bitsring: Update to 4.1.0.
    
    * gnu/packages/ocaml.scm (ocaml-bitstring): Update to 4.1.0.
    (ocaml4.07-bitstring): New variable.
---
 gnu/packages/ocaml.scm | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 4f3afd8..c6ea943 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1845,22 +1845,23 @@ ocaml-migrate-parsetree")
 (define-public ocaml-bitstring
   (package
     (name "ocaml-bitstring")
-    (version "3.1.0")
+    (version "4.1.0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append 
"https://bitbucket.org/thanatonauts/bitstring/";
-                                  "get/v" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/xguerin/bitstring";)
+                     (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "15jjk2pq1vx311gl49s5ag6x5y0654x35w75z07g7kr2q334hqps"))))
+                "0mghsl8b2zd2676mh1r9142hymhvzy9cw8kgkjmirxkn56wbf56b"))))
     (build-system dune-build-system)
     (native-inputs
      `(("time" ,time)
        ("autoconf" ,autoconf)
        ("automake" ,automake)))
     (propagated-inputs
-     `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned)))
+     `(("ocaml-stdlib-shims" ,ocaml-stdlib-shims)))
     (arguments
      `(#:package "bitstring"
        #:tests? #f; Tests fail to build
@@ -1870,6 +1871,7 @@ ocaml-migrate-parsetree")
            (lambda _
              (invoke "dune" "upgrade")
              #t)))))
+    (properties `((ocaml4.07-variant . ,(delay ocaml4.07-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
@@ -1878,6 +1880,23 @@ 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.07-bitstring
+  (package-with-ocaml4.07
+    (package
+      (inherit ocaml-bitstring)
+      (version "3.1.0")
+      (source (origin
+                (method url-fetch)
+                (uri (string-append 
"https://bitbucket.org/thanatonauts/bitstring/";
+                                    "get/v" version ".tar.gz"))
+                (file-name (string-append "ocaml-bitsring-" version ".tar.gz"))
+                (sha256
+                 (base32
+                  "15jjk2pq1vx311gl49s5ag6x5y0654x35w75z07g7kr2q334hqps"))))
+      (propagated-inputs
+       `(("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned)))
+      (properties '()))))
  
 (define-public ocaml-result
   (package