From: Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>
To: 71145@debbugs.gnu.org
Cc: Jean-Pierre De Jesus DIAZ <jean@foundation.xyz>,
Julien Lepiller <julien@lepiller.eu>,
pukkamustard <pukkamustard@posteo.net>
Subject: [bug#71145] [PATCH 3/3] gnu: ocaml-sedlex: Update to 3.2.
Date: Thu, 23 May 2024 13:47:06 +0200 [thread overview]
Message-ID: <e0be8f3d885ca4bf356532091ee8c4514a1d1436.1716464340.git.jean@foundation.xyz> (raw)
In-Reply-To: <cover.1716464340.git.jean@foundation.xyz>
* gnu/packages/haxe.scm (ocaml-sedlex): Update to 3.2.
(ocaml-sedlex-2): New variable.
(ocaml-piqilib) <propagated-inputs>: Replace ocaml-sedlex by ocaml-sedlex-2.
* gnu/packages/ocaml.scm (haxe) <inputs>: Replace ocaml-sedlex by ocaml-sedlex-2.
Change-Id: I0ae3609f8db22589d8fdd110d1b7b92f6fead15d
---
gnu/packages/haxe.scm | 2 +-
gnu/packages/ocaml.scm | 28 ++++++++++++++++++++++++----
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/haxe.scm b/gnu/packages/haxe.scm
index c7af07325f..f1cdc8732f 100644
--- a/gnu/packages/haxe.scm
+++ b/gnu/packages/haxe.scm
@@ -177,7 +177,7 @@ (define-public haxe
ocaml-extlib
ocaml-luv
ocaml-ptmap
- ocaml-sedlex
+ ocaml-sedlex-2
ocaml-sha
ocaml-xml-light
pcre2
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 10b98ca758..c96b374a99 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -3772,7 +3772,7 @@ (define-public ocaml-gen
(define-public ocaml-sedlex
(package
(name "ocaml-sedlex")
- (version "2.6")
+ (version "3.2")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3781,10 +3781,10 @@ (define-public ocaml-sedlex
(file-name (git-file-name name version))
(sha256
(base32
- "1z8mmk1idh9hjhh2b9rp5b1h8kmzcxhagqkw0pvxn6ykx1brskq1"))))
+ "1vzsmp8mvx9vrgjr5chsk2p2s5ii08c9kizw9ilx78jj30nzamz5"))))
(build-system dune-build-system)
(arguments
- (list #:tests? #f ; no tests
+ (list ;#:tests? #f ; no tests
#:package "sedlex"
#:phases
#~(modify-phases %standard-phases
@@ -3807,6 +3807,7 @@ (define-public ocaml-sedlex
(add-before 'build 'chmod
(lambda _
(for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")))))))
+ (native-inputs (list ocaml-ppx-expect))
(propagated-inputs
(list ocaml-gen ocaml-ppxlib ocaml-uchar))
(inputs
@@ -3816,6 +3817,25 @@ (define-public ocaml-sedlex
(description "Lexer generator for Unicode and OCaml.")
(license license:expat)))
+(define-public ocaml-sedlex-2
+ (package
+ (inherit ocaml-sedlex)
+ (name "ocaml-sedlex")
+ (version "2.6")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ocaml-community/sedlex")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1z8mmk1idh9hjhh2b9rp5b1h8kmzcxhagqkw0pvxn6ykx1brskq1"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments ocaml-sedlex)
+ ((#:tests? _ #t) #f))) ; no tests
+ (native-inputs '())))
+
(define-public ocaml-uchar
(package
(name "ocaml-uchar")
@@ -5218,7 +5238,7 @@ (define-public ocaml-piqilib
(list which))
(propagated-inputs
`(("ocaml-xmlm" ,ocaml-xmlm)
- ("ocaml-sedlex" ,ocaml-sedlex)
+ ("ocaml-sedlex" ,ocaml-sedlex-2)
("ocaml-easy-format" ,ocaml-easy-format)
("ocaml-base64" ,ocaml-base64)))
(home-page "https://piqi.org")
--
2.41.0
next prev parent reply other threads:[~2024-05-23 11:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-23 11:42 [bug#71145] [PATCH 0/3] gnu: ocaml-sedlex: Update to 3.2 Jean-Pierre De Jesus DIAZ
2024-05-23 11:47 ` [bug#71145] [PATCH 1/3] gnu: ocaml-sedlex: Use G-Expressions Jean-Pierre De Jesus DIAZ
2024-05-23 11:47 ` [bug#71145] [PATCH 2/3] gnu: ocaml-sedlex: Use ucd package Jean-Pierre De Jesus DIAZ
2024-05-23 11:47 ` Jean-Pierre De Jesus DIAZ [this message]
2024-11-20 22:38 ` bug#71145: [PATCH 0/3] gnu: ocaml-sedlex: Update to 3.2 Ludovic Courtès
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=e0be8f3d885ca4bf356532091ee8c4514a1d1436.1716464340.git.jean@foundation.xyz \
--to=jean@foundation.xyz \
--cc=71145@debbugs.gnu.org \
--cc=julien@lepiller.eu \
--cc=pukkamustard@posteo.net \
/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).