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 2/3] gnu: ocaml-sedlex: Use ucd package.
Date: Thu, 23 May 2024 13:47:05 +0200 [thread overview]
Message-ID: <847d1287e1bd8b85e619e625195984432b7032de.1716464340.git.jean@foundation.xyz> (raw)
In-Reply-To: <cover.1716464340.git.jean@foundation.xyz>
* gnu/packages/ocaml.scm (ocaml-sedlex): Use ucd for Unicode files.
Change-Id: I8c54e15bcb32cf315fde28921611b20eeb2a6637
---
gnu/packages/ocaml.scm | 35 +++++++++--------------------------
1 file changed, 9 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 2100227adf..10b98ca758 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -87,6 +87,7 @@ (define-module (gnu packages ocaml)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages time)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages unicode)
#:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization)
#:use-module (gnu packages web)
@@ -3788,6 +3789,8 @@ (define-public ocaml-sedlex
#:phases
#~(modify-phases %standard-phases
(add-before 'build 'copy-resources
+ ;; These three files are needed by src/generator/data/dune,
+ ;; but would be downloaded using curl at build time.
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "src/generator/data"
;; Newer versions of dune emit an error if files it wants to
@@ -3796,38 +3799,18 @@ (define-public ocaml-sedlex
(delete-file "dune")
(for-each
(lambda (file)
- (copy-file (assoc-ref inputs file) file))
- '("DerivedCoreProperties.txt" "DerivedGeneralCategory.txt"
- "PropList.txt")))))
+ (copy-file (search-input-file inputs file)
+ (basename file)))
+ '("share/ucd/extracted/DerivedGeneralCategory.txt"
+ "share/ucd/DerivedCoreProperties.txt"
+ "share/ucd/PropList.txt")))))
(add-before 'build 'chmod
(lambda _
(for-each (lambda (file) (chmod file #o644)) (find-files "." ".*")))))))
(propagated-inputs
(list ocaml-gen ocaml-ppxlib ocaml-uchar))
- ;; These three files are needed by src/generator/data/dune, but would be
- ;; downloaded using curl at build time.
(inputs
- `(("DerivedCoreProperties.txt"
- ,(origin
- (method url-fetch)
- (uri "https://www.unicode.org/Public/12.1.0/ucd/DerivedCoreProperties.txt")
- (sha256
- (base32
- "0s6sn1yr9qmb2i6gf8dir2zpsbjv1frdfzy3i2yjylzvf637msx6"))))
- ("DerivedGeneralCategory.txt"
- ,(origin
- (method url-fetch)
- (uri "https://www.unicode.org/Public/12.1.0/ucd/extracted/DerivedGeneralCategory.txt")
- (sha256
- (base32
- "1rifzq9ba6c58dn0lrmcb5l5k4ksx3zsdkira3m5p6h4i2wriy3q"))))
- ("PropList.txt"
- ,(origin
- (method url-fetch)
- (uri "https://www.unicode.org/Public/12.1.0/ucd/PropList.txt")
- (sha256
- (base32
- "0gsb1jpj3mnqbjgbavi4l95gl6g4agq58j82km22fdfg63j3w3fk"))))))
+ (list ucd))
(home-page "https://www.cduce.org/download.html#side")
(synopsis "Lexer generator for Unicode and OCaml")
(description "Lexer generator for Unicode and OCaml.")
--
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 ` Jean-Pierre De Jesus DIAZ [this message]
2024-05-23 11:47 ` [bug#71145] [PATCH 3/3] gnu: ocaml-sedlex: Update to 3.2 Jean-Pierre De Jesus DIAZ
2024-11-20 22:38 ` bug#71145: [PATCH 0/3] " 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=847d1287e1bd8b85e619e625195984432b7032de.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).