unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Xinglu Chen <public@yoctocell.xyz>
To: 49101@debbugs.gnu.org
Subject: [bug#49101] [PATCH v2 1/5] gnu: ocaml4.07-pcre: Switch to default OCaml compiler.
Date: Sat, 19 Jun 2021 11:03:39 +0200	[thread overview]
Message-ID: <297c3da0df390937b17eb9fceb33202a25bf1f34.1624093132.git.public@yoctocell.xyz> (raw)
In-Reply-To: <cover.1624093132.git.public@yoctocell.xyz>

* gnu/packages/ocaml.scm (ocaml4.07-pcre): Rename to ‘ocaml-pcre’.
[version]: Update to latest version.
[arguments]: Use default OCaml compiler.
[native-inputs]: Adjust accordingly.
[propagated-inputs]: Likewise.
---
 gnu/packages/ocaml.scm | 50 ++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index a8432ebbfe..e02684fefd 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3086,35 +3086,37 @@ every compliant installation of OCaml and organize these libraries into a
 hierarchy of modules.")
     (license license:lgpl2.1+)))
 
-(define-public ocaml4.07-pcre
+(define-public ocaml-pcre
   (package
-    (name "ocaml4.07-pcre")
-    (version "7.4.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/mmottl/pcre-ocaml")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "11sd8g668h48790lamz0riw9jgnfkaif5qdfa0akcndwa6aj07jf"))))
+    (name "ocaml-pcre")
+    (version "7.4.6")
+    (source
+      (origin
+        (method git-fetch)
+        (uri (git-reference
+              (url "https://github.com/mmottl/pcre-ocaml")
+              (commit version)))
+        (file-name (git-file-name name version))
+        (sha256
+          (base32
+            "11mck879p5zvkghps4ky8yslm0isgz52d84adl0dmcfxv2ibvcym"))))
     (build-system dune-build-system)
     (arguments
-     `(#:test-target "."
-       #:ocaml ,ocaml-4.07
-       #:findlib ,ocaml4.07-findlib
-       #:dune ,ocaml4.07-dune))
+     ;; No tests.
+     '(#:tests? #f))
+    (propagated-inputs
+     `(("dune-configurator" ,dune-configurator)
+       ("pcre" ,pcre)))
     (native-inputs
-     `(("ocaml-base" ,(package-with-ocaml4.07 ocaml-base))
-       ("pcre:bin" ,pcre "bin")))
-    (propagated-inputs `(("pcre" ,pcre)))
+     `(("pcre:bin" ,pcre "bin")))
     (home-page "https://mmottl.github.io/pcre-ocaml")
-    (synopsis "Bindings to the Perl Compatibility Regular Expressions library")
-    (description "Pcre-ocaml offers library functions for string pattern
-matching and substitution, similar to the functionality offered by the Perl
-language.")
-    (license license:lgpl2.1+))); with the OCaml link exception
+    (synopsis
+      "Bindings to the Perl Compatibility Regular Expressions library")
+    (description "pcre-ocaml offers library functions for string
+pattern matching and substitution, similar to the functionality
+offered by the Perl language.")
+    ;; With static linking exception
+    (license license:lgpl2.1+)))
 
 (define-public ocaml4.07-expect
   (package
-- 
2.32.0






  reply	other threads:[~2021-06-19  9:04 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-18 19:00 [bug#49101] [PATCH 0/4] Add ocaml-mparser & friends Xinglu Chen
2021-06-18 19:03 ` [bug#49101] [PATCH 1/4] gnu: Add ocaml-mparser Xinglu Chen
2021-06-18 19:03 ` [bug#49101] [PATCH 3/4] gnu: Add ocaml-mparser-pcre Xinglu Chen
2021-06-18 19:03 ` [bug#49101] [PATCH 4/4] gnu: Add ocaml-pcre Xinglu Chen
2021-06-18 19:03 ` [bug#49101] [PATCH 2/4] gnu: Add ocaml-mparser-re Xinglu Chen
2021-06-18 22:28 ` [bug#49101] [PATCH 0/4] Add ocaml-mparser & friends Julien Lepiller
2021-06-19  8:35   ` Xinglu Chen
2021-06-19  9:03 ` [bug#49101] [PATCH v2 0/5] Add ocaml-mparser & firends Xinglu Chen
2021-06-19  9:03   ` Xinglu Chen [this message]
2021-06-19 11:01     ` [bug#49101] [PATCH v2 1/5] gnu: ocaml4.07-pcre: Switch to default OCaml compiler Julien Lepiller
2021-06-19 13:51       ` Xinglu Chen
2021-06-19  9:03   ` [bug#49101] [PATCH v2 2/5] gnu: ocaml4.07-expect: " Xinglu Chen
2021-06-19 11:05     ` Julien Lepiller
2021-06-19 13:57       ` Xinglu Chen
2021-06-19 14:06         ` Xinglu Chen
2021-06-19 15:09           ` Julien Lepiller
2021-06-19  9:03   ` [bug#49101] [PATCH v2 3/5] gnu: Add ocaml-mparser Xinglu Chen
2021-06-19  9:03   ` [bug#49101] [PATCH v2 4/5] gnu: Add ocaml-mparser-re Xinglu Chen
2021-06-19  9:03   ` [bug#49101] [PATCH v2 5/5] gnu: Add ocaml-mparser-pcre Xinglu Chen
2021-06-19 15:50   ` [bug#49101] [PATCH v3 0/6] Add ocaml-mparser & friends Xinglu Chen
2021-06-19 15:50     ` [bug#49101] [PATCH v3 1/6] gnu: Add ocaml-pcre Xinglu Chen
2021-06-19 15:50     ` [bug#49101] [PATCH v3 2/6] gnu: ocaml4.07-expect: Switch to default OCaml compiler Xinglu Chen
2021-06-19 15:50     ` [bug#49101] [PATCH v3 3/6] gnu: ocaml4.07-pcre: Remove package Xinglu Chen
2021-06-19 15:50     ` [bug#49101] [PATCH v3 4/6] gnu: Add ocaml-mparser Xinglu Chen
2021-06-19 15:50     ` [bug#49101] [PATCH v3 5/6] gnu: Add ocaml-mparser-re Xinglu Chen
2021-06-19 15:50     ` [bug#49101] [PATCH v3 6/6] gnu: Add ocaml-mparser-pcre Xinglu Chen
2021-06-20  0:16     ` bug#49101: [PATCH v3 0/6] Add ocaml-mparser & friends Julien Lepiller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=297c3da0df390937b17eb9fceb33202a25bf1f34.1624093132.git.public@yoctocell.xyz \
    --to=public@yoctocell.xyz \
    --cc=49101@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).