[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#49101] [PATCH v2 1/5] gnu: ocaml4.07-pcre: Switch to default OCaml
From: |
Xinglu Chen |
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 |
* 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
- [bug#49101] [PATCH 0/4] Add ocaml-mparser & friends, Xinglu Chen, 2021/06/18
- [bug#49101] [PATCH 3/4] gnu: Add ocaml-mparser-pcre., Xinglu Chen, 2021/06/18
- [bug#49101] [PATCH 1/4] gnu: Add ocaml-mparser., Xinglu Chen, 2021/06/18
- [bug#49101] [PATCH 4/4] gnu: Add ocaml-pcre., Xinglu Chen, 2021/06/18
- [bug#49101] [PATCH 2/4] gnu: Add ocaml-mparser-re., Xinglu Chen, 2021/06/18
- [bug#49101] [PATCH 0/4] Add ocaml-mparser & friends, Julien Lepiller, 2021/06/18
- [bug#49101] [PATCH v2 0/5] Add ocaml-mparser & firends, Xinglu Chen, 2021/06/19