gnu: ocaml-sedlex: Update to 3.2.

* 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
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Jean-Pierre De Jesus DIAZ 2024-05-23 13:47:06 +02:00 committed by Ludovic Courtès
parent a9236a7dc1
commit b5e7f2a65a
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 25 additions and 6 deletions

View file

@ -177,7 +177,7 @@ interactive languages.")
ocaml-extlib ocaml-extlib
ocaml-luv ocaml-luv
ocaml-ptmap ocaml-ptmap
ocaml-sedlex ocaml-sedlex-2
ocaml-sha ocaml-sha
ocaml-xml-light ocaml-xml-light
pcre2 pcre2

View file

@ -3709,7 +3709,7 @@ and consumable.")
(define-public ocaml-sedlex (define-public ocaml-sedlex
(package (package
(name "ocaml-sedlex") (name "ocaml-sedlex")
(version "2.6") (version "3.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3718,11 +3718,10 @@ and consumable.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1z8mmk1idh9hjhh2b9rp5b1h8kmzcxhagqkw0pvxn6ykx1brskq1")))) "1vzsmp8mvx9vrgjr5chsk2p2s5ii08c9kizw9ilx78jj30nzamz5"))))
(build-system dune-build-system) (build-system dune-build-system)
(arguments (arguments
(list #:tests? #f ; no tests (list #:package "sedlex"
#:package "sedlex"
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'build 'copy-resources (add-before 'build 'copy-resources
@ -3744,6 +3743,7 @@ and consumable.")
(add-before 'build 'chmod (add-before 'build 'chmod
(lambda _ (lambda _
(for-each (lambda (file) (chmod file #o644)) (find-files "." ".*"))))))) (for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")))))))
(native-inputs (list ocaml-ppx-expect))
(propagated-inputs (propagated-inputs
(list ocaml-gen ocaml-ppxlib ocaml-uchar)) (list ocaml-gen ocaml-ppxlib ocaml-uchar))
(inputs (inputs
@ -3753,6 +3753,25 @@ and consumable.")
(description "Lexer generator for Unicode and OCaml.") (description "Lexer generator for Unicode and OCaml.")
(license license:expat))) (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 (define-public ocaml-uchar
(package (package
(name "ocaml-uchar") (name "ocaml-uchar")
@ -5155,7 +5174,7 @@ Format module of the OCaml standard library.")
(list which)) (list which))
(propagated-inputs (propagated-inputs
`(("ocaml-xmlm" ,ocaml-xmlm) `(("ocaml-xmlm" ,ocaml-xmlm)
("ocaml-sedlex" ,ocaml-sedlex) ("ocaml-sedlex" ,ocaml-sedlex-2)
("ocaml-easy-format" ,ocaml-easy-format) ("ocaml-easy-format" ,ocaml-easy-format)
("ocaml-base64" ,ocaml-base64))) ("ocaml-base64" ,ocaml-base64)))
(home-page "https://piqi.org") (home-page "https://piqi.org")