From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:1008:1e59::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 8Bz5IUctT2YSdQAAA41jLg (envelope-from ) for ; Thu, 23 May 2024 13:49:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id QK5JHUctT2Yh3AAA62LTzQ (envelope-from ) for ; Thu, 23 May 2024 13:49:27 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foundation.xyz header.s=google header.b=rcLwGyZs; dmarc=fail reason="SPF not aligned (relaxed)" header.from=foundation.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1716464967; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=7zGl3shnFbZ8GWsUZvHgCpNWrp9kehHLtOKkbZ0cxME=; b=f9r3xgQkDPNJkXqJLLSctBbPChc4RzJ59qYkgOzOrHKq27eD1jaubIqViQBMw/1XAwSpIL uWne7A5MVe696hLQsQJjEbGuCjfZQPl5+y5OmshDKYsKH+0m9J6E05eOkiozmFnjSCtiWP 8j5rF4L1TyCmLwLzADGpcPQyPJt20XA3jGhCjbKwF1YZAHU3nqNK4O2ahhw6yyOUDex6Q3 HUutMb0YfetLLlyCdcOlpjA4FXWuwOW9TOHsjtLP+W/fTC29CySGU8kcWZxZPKfVZUGxnJ pGZJRaNJsLCAzotK6hVY+UHbR8HPPyJgWcVuvkySM9vasIvgPfFjckstSceENw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1716464967; a=rsa-sha256; cv=none; b=jDcAl6Ce34cPsp6KuHea4wRZiwY9KLgM6b4y+V5v3SEPUioWDe6QH+hg4tthIIJAW40ck0 9AaaCmwnfkS+wi4c0lgDByNjru/YhRfiSqgoiPXAL++goSIfSZdRbU5xa1Dg6BkyZKR2km lBDHIglxeTrRHNpJSCAXMwlpuUT0W9Un5zXLfA+qgKAqNlxFemgF1TPR7S0unS/VZKOtlX iuHMJZKY3H4xw9WHectN1fDNiVKUds/mayJBMpb+zp+0E1A0Owoj+wvQ4rWns8/w2Cy5yP FVkoEI0e79mIAivSqlbhUzoUhG8dGt8i1PwmLVXmLGo6FCJsXZIEgWi5NkibvQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=foundation.xyz header.s=google header.b=rcLwGyZs; dmarc=fail reason="SPF not aligned (relaxed)" header.from=foundation.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1DD49E1B0 for ; Thu, 23 May 2024 13:49:27 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sA6wN-0000c2-R2; Thu, 23 May 2024 07:48:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sA6wM-0000aG-Hq for guix-patches@gnu.org; Thu, 23 May 2024 07:48:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sA6wL-0007vK-5Q for guix-patches@gnu.org; Thu, 23 May 2024 07:48:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sA6wQ-0001le-Ap; Thu, 23 May 2024 07:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71145] [PATCH 2/3] gnu: ocaml-sedlex: Use ucd package. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: julien@lepiller.eu, pukkamustard@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 23 May 2024 11:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71145 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71145@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ , Julien Lepiller , pukkamustard X-Debbugs-Original-Xcc: Julien Lepiller , pukkamustard Received: via spool by 71145-submit@debbugs.gnu.org id=B71145.17164649116771 (code B ref 71145); Thu, 23 May 2024 11:49:02 +0000 Received: (at 71145) by debbugs.gnu.org; 23 May 2024 11:48:31 +0000 Received: from localhost ([127.0.0.1]:58970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sA6vv-0001l9-47 for submit@debbugs.gnu.org; Thu, 23 May 2024 07:48:31 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:47550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sA6vr-0001kl-Bo for 71145@debbugs.gnu.org; Thu, 23 May 2024 07:48:29 -0400 Received: by mail-wm1-f67.google.com with SMTP id 5b1f17b1804b1-4200ee78f33so19111445e9.3 for <71145@debbugs.gnu.org>; Thu, 23 May 2024 04:48:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundation.xyz; s=google; t=1716464835; x=1717069635; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7zGl3shnFbZ8GWsUZvHgCpNWrp9kehHLtOKkbZ0cxME=; b=rcLwGyZsTattzPlbAzo1Hs/SjIwKkT8AjOWQp3UAXJ/cMmqPBmrcwTs/9vI2NUHpeS D+t/T3YftPf0ox+3oBCTzTz1oZ3mFzEGdKX7rFNi2c1yH/KOMoSMjnqlBVqREYC9ONHu XEoWyHPHHtFWnDcJjl5/X9ShwO7liQAubH5x9WXejsHC0atED9TxOhl8KYOtdvB6VafX CRM0BehbofcFDnr3HKitayeL5Lc72maGoH7z8yxtSDoldXJexC5XgnsQR6AGv6YG//Kb 7b0e6CK3XBklsEVFiqT0cH8VtRcovw7xM7VFPAiNBhgNkfExMlxQwXysnIja4xZ1k47Y 7TFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716464835; x=1717069635; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7zGl3shnFbZ8GWsUZvHgCpNWrp9kehHLtOKkbZ0cxME=; b=hmndvKxf22NpysQ3Oqf8exQdG2swtSZiaHT9H+MJfTlF0bXUTlLAC+QKyO8AS87JHI SZCgY/9Dce8dI/PVeWVg3BbVdAp66Rw+PFIczaeuqmNJ249fFWjX7zb7+6ehOl3jGGXM 7o565ZnkHsc2DIN/V13LUJl8qHwWYlWxpfQbQMkgwDu3q1bONE+diuX++sJNu+PIup+Z kHIadBYoo6MvaD3dFZwEklnsfxXaUXZlxeAPwyOtH3MiF/Gn0OJrK9Gg1FIkF2uoG8X4 i49HZ4LR4VmS7La4WWojzcwM7bpYMDy7igX2yC10QwJ9U1a4Q51Jv9Kmr0anuxp423Rq vMpA== X-Gm-Message-State: AOJu0Ywi4qnqofpsmZGjtG1gkEfMTUW+rSElDljKs1Q5PeKkcXKjxSP6 oqeZRsXsnTnwnn4u9z6RXjrKtSafLixBRw0IIFb4iswZggWQcb15tSit70qPbpBU+2hK4vjYPGm T6Siq1Vz1 X-Google-Smtp-Source: AGHT+IGQifVv9krZdCG+DSt/yJfyuPCSjWmksz3MR1nGe2xn3RbBHDg1iY7/cVpmwdZ35t7CBLXcqw== X-Received: by 2002:a1c:7703:0:b0:41f:b0e7:f299 with SMTP id 5b1f17b1804b1-420fd3032bfmr36316745e9.9.1716464835214; Thu, 23 May 2024 04:47:15 -0700 (PDT) Received: from jeandudey.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42100f99d7fsm23213205e9.31.2024.05.23.04.47.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 May 2024 04:47:14 -0700 (PDT) From: Jean-Pierre De Jesus DIAZ Date: Thu, 23 May 2024 13:47:05 +0200 Message-ID: <847d1287e1bd8b85e619e625195984432b7032de.1716464340.git.jean@foundation.xyz> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -0.76 X-Spam-Score: -0.76 X-Migadu-Queue-Id: 1DD49E1B0 X-Migadu-Scanner: mx11.migadu.com X-TUID: 25preYbYw/lx * 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