From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id opvKKOrhsGPFzwAAbAwnHQ (envelope-from ) for ; Sun, 01 Jan 2023 02:29:14 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id 4GfCJ+rhsGPuGgAAauVa8A (envelope-from ) for ; Sun, 01 Jan 2023 02:29:14 +0100 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 2616C1FDA4 for ; Sun, 1 Jan 2023 02:29:14 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBn9s-0001yo-V6; Sat, 31 Dec 2022 20:29:04 -0500 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 1pBn9q-0001yd-UG for guix-patches@gnu.org; Sat, 31 Dec 2022 20:29:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pBn9q-0008S5-J7 for guix-patches@gnu.org; Sat, 31 Dec 2022 20:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pBn9p-0006e4-Rj for guix-patches@gnu.org; Sat, 31 Dec 2022 20:29:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60358] [PATCH v7 3/5] gnu: UCD: Add version 3.0-update1. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 01 Jan 2023 01:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vivien Kraus , 60358@debbugs.gnu.org Received: via spool by 60358-submit@debbugs.gnu.org id=B60358.167253652725518 (code B ref 60358); Sun, 01 Jan 2023 01:29:01 +0000 Received: (at 60358) by debbugs.gnu.org; 1 Jan 2023 01:28:47 +0000 Received: from localhost ([127.0.0.1]:40047 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBn9a-0006dV-QS for submit@debbugs.gnu.org; Sat, 31 Dec 2022 20:28:47 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:41497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBn9Y-0006dD-UX for 60358@debbugs.gnu.org; Sat, 31 Dec 2022 20:28:45 -0500 Received: by mail-ed1-f68.google.com with SMTP id g1so21382905edj.8 for <60358@debbugs.gnu.org>; Sat, 31 Dec 2022 17:28:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=V7guXbru5yH7sFkDcdV4JQVzbYBY8qg5niqvzje+Tjw=; b=jblovc50YWVgKG3UcaZ9DT26OwXvmH45j0xhJcXGh9r9j6891ToTXIH+aqV7cMr3e4 bNccNqVMysN1cQOW9NzE8Hv4TcyypDRn8ftagxkTmeUc7954VvOETP/zef1xcx2eFfwi WIsD8ogQFsy4iJnHavijbDYlAWRLfrSCP0kSg0exM4CkmePgqq1sfQKA4PZDweE/1DKr sYO7ACTYya/iw2NqkkKNjhdwHFzXKvQ4kxskDnP6TicQCxgOF5FVP55qNTtOQmr8fDRE RG/U53u7uKE8WKuK5mmVGDsKZGOMCwXHmZLB87lT88fj8ve8VowpdT3WOvKDTEXcOLSo MoBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=V7guXbru5yH7sFkDcdV4JQVzbYBY8qg5niqvzje+Tjw=; b=M6k940MwavxI7P/sgMyWFMUFMHdpPDpxnlUjQE2gRjFxM5UtvIW4yO+GyMqtw7oagw Y1QOQqEhnwptBNJ+qzehawYTMjpUejMsrtjZjyCUcVweFiaUkhXTxkuwjn0p/wpoAkIn 9sL+cGsrtSWsVpfJr+1CBOVIWCxUZfUk/+Vd5AHXyOqHnX8bm2Ctd+5X8iiWdwgosHwh HGdDqevavb6asEJEAPf0CGxao1ObIfHU00JfsKxqN8zOg3gTQfoX+rZ76CExEY8hBQxc bFjB5k1be6gs07XbmBtZ/hzeov/qKzuuPQzDzteLMz8Z9kihMj1Cgm0pC5auSKL6GoDR dzXA== X-Gm-Message-State: AFqh2krBFmgos0BkMv110LQnw7gKDfF7gNS/d6sthDIMhN+cpfzpNoBA k1MwBfQ5QKa7kZSmA28NoZw= X-Google-Smtp-Source: AMrXdXv03bWMFTHTJk7+Nfb2bFSZHqMs8F9IdvmrgLhjNATxo2PdLjawPKWBa1Nz8Z1ki3Q/2agCBw== X-Received: by 2002:aa7:dd13:0:b0:46b:8d4f:1699 with SMTP id i19-20020aa7dd13000000b0046b8d4f1699mr43606980edv.14.1672536518790; Sat, 31 Dec 2022 17:28:38 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id r7-20020aa7c147000000b0046cbcc86bdesm11130584edp.7.2022.12.31.17.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Dec 2022 17:28:38 -0800 (PST) Message-ID: <73cdf6ccd738d27a1b92bf106f91f9a8a6662559.camel@gmail.com> From: Liliana Marie Prikler Date: Sun, 01 Jan 2023 02:28:36 +0100 In-Reply-To: <2206897d7f4826d78caf52b1b7eca47c92313255.camel@planete-kraus.eu> References: <86ed1bdd80433e8f3a0407bfe51d1ed4713e875f.camel@planete-kraus.eu> <4f6066deb9488cfe7bcb5bce1ae93d452f517b9f.camel@gmail.com> <2206897d7f4826d78caf52b1b7eca47c92313255.camel@planete-kraus.eu> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.0 MIME-Version: 1.0 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-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672536554; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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=V7guXbru5yH7sFkDcdV4JQVzbYBY8qg5niqvzje+Tjw=; b=PIqGvr2OPp134EuoQlJYbG2RuutO5jeRRWxsKzWkNjrQ45KtzTeSMi+/l9YP9jRR8bfbiG U6mvAuz04Xk5GXUccFpStRDSHXjGNAYOQv/CrMgNaJ2nqGnnCfGpLkDu1e047cYQdCkaVG 3yLJ74iS8UFGmYubqnNI+hCeBtNt0oXD6aPTG9BlO1U2zbzfjfG7fRCCMUruZNnJqUiOUc 93obMVRvGYMYkq844wcuyL8rw5FNeXihdx5E1WtEiOsrl8cHQCxbHfBEu/dlpdBQ+DUK3t fXhKQtumc3TPLdZ+4LfHnpdZn+PHh5ZoS7SXsaKox88CcNe8iPq0WehxjFqUsg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=jblovc50; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672536554; a=rsa-sha256; cv=none; b=fgi32adzOS9+wbq+iDwOSZ/V8RSrl1kzgDqIzyz0v07+UcUGGWYGIYKTiJH9PmlK+CZgnp +Yu9G1xyIqQSXbc06FDJLBPzQLmfsQn1eVYnG/W/Rpopt1yiiYDoDP1d5dq24nCJSILJrO d2VsoK1X2kev3SK6/NCzcJ6QAVzTEuZ1qsZTroa1Q0Gar5KTS2ajaoQzmIaSW7RX1XiEBz njYyYufNPPOlLTiMF59HdAxPX9gf7BqG6pigllwDqRdHYQxEwzwYcPohV0hzQcQelu/44v GjDf5I7EV2NW3Xbb70kWBe4iYKPTQlk/NmJMb0eDHzWvoEpJ4vRGa9NS2tV/QA== X-Spam-Score: 5.96 X-Migadu-Queue-Id: 2616C1FDA4 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=jblovc50; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 5.96 X-TUID: 08O+gbTefm6x Am Sonntag, dem 01.01.2023 um 01:24 +0100 schrieb Vivien Kraus: > Happy new year! >=20 > Le samedi 31 d=C3=A9cembre 2022 =C3=A0 20:17 +0100, Liliana Marie Prikler= a > =C3=A9crit=C2=A0: > > Am Freitag, dem 30.12.2022 um 22:20 +0100 schrieb Vivien Kraus: > > > * gnu/packages/unicode.scm (ucd3.0-update1): New variable. > > Once again, do you need all of these, or just a single file?=C2=A0 (Or > > indeed none at all?) >=20 > The build fails if I pass an empty file or a file with just the > header. >=20 > I switched to an unnamed origin in the build phase, is that better? Yes, that is better =E2=80=93 an outside variable would also have been, but= it works for now. > + (("sc_check_sym_list") > + "disabled_check_sym_list") > + (("sc_cpp_indent_check") > + "disabled_cpp_indent_check") > + (("sc_check_copyright") > + "disabled_check_copyright") > + (("sc_prohibit_AC_LIBOBJ_in_m4") > + "disabled_prohibit_AC_LIBOBJ_in_m4") > + (("sc_prefer_ac_check_funcs_once") > + "disabled_prefer_ac_check_funcs_once") > + (("sc_prohibit_leading_TABs") > + "disabled_prohibit_leading_TABs")))) I think matching the name and then doing (string-append "disabled_" test) should work better and possibly lets you group some. > + (define (find-ucd-file name) > + (search-input-file inputs (string-append > "share/ucd/" name))) I think you should also=C2=A0 (define (find-ucd-files . files) (map find-ucd-file files)) Then you can > + (apply invoke > + "./gen-uni-tables" > + `(,@(map find-ucd-file > + '("UnicodeData.txt" > + "PropList.txt" > + "DerivedCoreProperties.txt" > + "emoji/emoji-data.txt" > + "ArabicShaping.txt" > + "Scripts.txt" > + "Blocks.txt")) > + ,PropList-3.0.1.txt > + ,@(map find-ucd-file > + '("EastAsianWidth.txt" > + "LineBreak.txt" > + "auxiliary/WordBreakProperty.txt" > + =20 > "auxiliary/GraphemeBreakProperty.txt" > + "CompositionExclusions.txt" > + "SpecialCasing.txt" > + "CaseFolding.txt")) (apply invoke (append (find-ucd-files "UnicodeData.txt" "PropList.txt" ...) (list PropList-3.0.1.txt) ; or inline the origin here (find-ucd-files "EastAsianWidth.txt" ...))) > + (copy-file (search-input-file inputs > "share/ucd/NameAliases.txt") > + "../tests/uniname/NameAliases.txt") > + (copy-file (search-input-file inputs > "share/ucd/UnicodeData.txt") > + "../tests/uniname/UnicodeData.txt") > + (copy-file (search-input-file inputs > "share/ucd/NormalizationTest.txt") > + "../tests/uninorm/NormalizationTest.txt") > + (copy-file (search-input-file inputs > "share/ucd/auxiliary/GraphemeBreakTest.txt") > + "../tests/unigbrk/GraphemeBreakTest.txt") > + (copy-file (search-input-file inputs > "share/ucd/auxiliary/WordBreakTest.txt") > + "../tests/uniwbrk/WordBreakTest.txt") Can we simplify this in terms of for-each and directory excursions? Also reuse find-ucd-file(s). > + (replace 'install > + (lambda _ > + (install-file "gnulib-tool" > + (string-append #$output "/bin")) > + (delete-file-recursively ".git") > + (copy-recursively "." (string-append #$output > "/src/gnulib/"))))))) Should we perhaps use copy-build-system instead and just copy over gnu:build and gnu:test? Cheers