[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#47768] [PATCH v2 13/43] gnu: Add ocaml-sedlex.
From: |
pukkamustard |
Subject: |
[bug#47768] [PATCH v2 13/43] gnu: Add ocaml-sedlex. |
Date: |
Mon, 10 May 2021 05:15:58 +0000 |
* gnu/packages/ocaml.scm (ocaml-sedlex): New variable.
(ocaml4.07-sedlex): Inherit from ocaml-sedlex.
---
gnu/packages/ocaml.scm | 57 ++++++++++++++++++++++++++++--------------
1 file changed, 38 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 7fe59c0b95..605567b996 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -2555,10 +2555,10 @@ representation of the data.")
and consumable.")
(license license:bsd-2)))
-(define-public ocaml4.07-sedlex
+(define-public ocaml-sedlex
(package
- (name "ocaml4.07-sedlex")
- (version "2.1")
+ (name "ocaml-sedlex")
+ (version "2.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2567,36 +2567,37 @@ and consumable.")
(file-name (git-file-name name version))
(sha256
(base32
- "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"))))
+ "0iw3phlaqr27jdf857hmj5v5hdl0vngbb2h37p2ll18sw991fxar"))))
(build-system dune-build-system)
(arguments
- `(#:tests? #f; no tests
+ `(#:tests? #f ; no tests
#:package "sedlex"
#:phases
(modify-phases %standard-phases
(add-before 'build 'copy-resources
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "src/generator/data"
+ ;; Newer versions of dune emit an error if files it wants to
+ ;; build already exist. Delete the dune file so dune doesn't
+ ;; complain.
+ (delete-file "dune")
(for-each
- (lambda (file)
- (copy-file (assoc-ref inputs file) file))
- '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt"
- "PropList.txt")))
+ (lambda (file)
+ (copy-file (assoc-ref inputs file) file))
+ '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt"
+ "PropList.txt")))
#t))
(add-before 'build 'chmod
(lambda _
(for-each (lambda (file) (chmod file #o644)) (find-files "."
".*"))
- #t)))
- #:ocaml ,ocaml-4.07
- #:findlib ,ocaml4.07-findlib
- #:dune ,ocaml4.07-dune))
+ #t)))))
(native-inputs
- `(("ocamlbuild" ,(package-with-ocaml4.07 ocamlbuild))))
+ `(("ocamlbuild" ,ocamlbuild)))
(propagated-inputs
- `(("ocaml-gen" ,(package-with-ocaml4.07 ocaml-gen))
- ("ocaml-ppx-tools-versioned"
- ,(package-with-ocaml4.07 ocaml-ppx-tools-versioned))
- ("ocaml-uchar" ,(package-with-ocaml4.07 ocaml-uchar))))
+ `(("ocaml-gen" ,ocaml-gen)
+ ("ocaml-ppxlib" ,ocaml-ppxlib)
+ ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned)
+ ("ocaml-uchar" ,ocaml-uchar)))
;; These three files are needed by src/generator/data/dune, but would be
;; downloaded using curl at build time.
(inputs
@@ -2621,11 +2622,29 @@ and consumable.")
(sha256
(base32
"0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk"))))))
+ (properties `((ocaml4.07-variant . ,(delay ocaml4.07-sedlex))))
(home-page "https://www.cduce.org/download.html#side")
(synopsis "Lexer generator for Unicode and OCaml")
(description "Lexer generator for Unicode and OCaml.")
(license license:expat)))
+(define-public ocaml4.07-sedlex
+ (package-with-ocaml4.07
+ (package
+ (inherit ocaml-sedlex)
+ (name "ocaml-sedlex")
+ (version "2.1")
+ (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
+ "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"))))
+ (properties '()))))
+
(define-public ocaml-uchar
(package
(name "ocaml-uchar")
@@ -3473,7 +3492,7 @@ Format module of the OCaml standard library.")
`(("which" ,which)))
(propagated-inputs
`(("ocaml-xmlm" ,(package-with-ocaml4.07 ocaml-xmlm))
- ("ocaml-sedlex" ,ocaml4.07-sedlex)
+ ("ocaml-sedlex" ,(package-with-ocaml4.07 ocaml-sedlex))
("ocaml-easy-format" ,(package-with-ocaml4.07 ocaml-easy-format))
("ocaml-base64" ,(package-with-ocaml4.07 ocaml-base64))))
(home-page "http://piqi.org")
--
2.31.1
- [bug#47768] [PATCH v2 09/43] gnu: Add ocaml-compiler-libs., (continued)
- [bug#47768] [PATCH v2 09/43] gnu: Add ocaml-compiler-libs., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 19/43] gnu: Add ocaml-ppx-compare., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 15/43] gnu: Add ocaml-ppx-sexp-conv., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 17/43] gnu: Add ocaml-ppx-let., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 33/43] gnu: Add ocaml-jane-street-headers., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 23/43] gnu: Add ocaml-ppx-custom-printf., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 03/43] gnu: ocaml-ctypes: Make ocaml-integers a propagated input., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 08/43] gnu: Add ocaml-stdio., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 10/43] gnu: ocaml-migrate-parsetree: Update to 1.8.0., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 05/43] gnu: ocaml-lwt: Update to 5.4.0., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 13/43] gnu: Add ocaml-sedlex.,
pukkamustard <=
- [bug#47768] [PATCH v2 12/43] gnu: Add ocaml-ppxlib., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 20/43] gnu: Add ocaml-ppx-here., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 11/43] gnu: ocaml-migrate-parsetree: Update to 2.1.0., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 21/43] gnu: Add ocaml-ppx-cold., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 30/43] gnu: Add ocaml-ppx-optcomp, pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 22/43] gnu: Add ocaml-ppx-assert., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 32/43] gnu: Add ocaml-jst-config., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 34/43] gnu: Add ocaml-time-now., pukkamustard, 2021/05/10
- [bug#47768] [PATCH v2 25/43] gnu: Add ocaml-ppx-enumerate., pukkamustard, 2021/05/10