From patchwork Tue Apr 29 20:42:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Khoo X-Patchwork-Id: 42164 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 82B6C27BC49; Tue, 29 Apr 2025 21:44:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E0FC727BC4C for ; Tue, 29 Apr 2025 21:44:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9roD-0007Co-K2; Tue, 29 Apr 2025 16:44:05 -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 1u9roB-0007Ar-61; Tue, 29 Apr 2025 16:44:03 -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 1u9roA-0007mL-CM; Tue, 29 Apr 2025 16:44:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=BtOeI4aWd2VeJNr8MUcnFfhyV/soipsIiDitf6wqZ1Y=; b=ktg9RqXwBndltNNi+brOaI0Efv5+EQrlg1mfo6pxrN2jpeLV1p5VVsiiiqWuJfyFGIEuTaHY6cmxAxkE6Y5XXIuwdrx4gzJjCOtuserEVASo1YFxRWk/XwiGXgWq6rriwRu/aZggxhTUoVE3rYl9Zroqf9Wnhh46JK4Md74dYLyirBFhmBeje9tTHSr0CyUTNTkqfK4xlNEfaKpghHZyfAwjsBkb0cEqWFt/pNTlWhw2FKhUml9ajI9QrfVt0XPbJGpDJ8iEzJRO6y+6Nw7K+Ny4TDboUDVSVBVJGN8pD5EIXyirkz2lnvqve8FcMi6TWe14V+f+a0PoySpUX5W7Qw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9ro9-00045u-TG; Tue, 29 Apr 2025 16:44:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77949] [PATCH v3 1/5] gnu: Add utf8proc-bootstrap. References: In-Reply-To: Resent-From: John Khoo Original-Sender: "Debbugs-submit" Resent-CC: johnkhootf@gmail.com, liliana.prikler@gmail.com, hako@ultrarare.space, help-debbugs@gnu.org, luispereira.tkd@gmail.com, zimon.toutoune@gmail.com, guix-patches@gnu.org Resent-Date: Tue, 29 Apr 2025 20:44:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77949 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77949@debbugs.gnu.org Cc: John Khoo , John Khoo , Liliana Marie Prikler , Hilton Chain , Debbugs Internal Request , Luis Pereira , Simon Tournier X-Debbugs-Original-Xcc: John Khoo , Liliana Marie Prikler , Hilton Chain , Debbugs Internal Request , Luis Pereira , Simon Tournier Received: via spool by 77949-submit@debbugs.gnu.org id=B77949.174595939515382 (code B ref 77949); Tue, 29 Apr 2025 20:44:01 +0000 Received: (at 77949) by debbugs.gnu.org; 29 Apr 2025 20:43:15 +0000 Received: from localhost ([127.0.0.1]:35160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9rnO-000401-NV for submit@debbugs.gnu.org; Tue, 29 Apr 2025 16:43:15 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:53606) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u9rnI-0003yD-NJ for 77949@debbugs.gnu.org; Tue, 29 Apr 2025 16:43:13 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-736a7e126c7so5978172b3a.3 for <77949@debbugs.gnu.org>; Tue, 29 Apr 2025 13:43:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745959382; x=1746564182; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=BtOeI4aWd2VeJNr8MUcnFfhyV/soipsIiDitf6wqZ1Y=; b=DTOo81Gs5XsCucuWi26ZfuhlK6DrujU+udbKxGzefthazAL4oh/WKSrSCb5xdvj6Zj eQD/AAoOOPMJBSckxRwCqq9Qtx7g6IiEK4IvkFe8T9uaILj/hoqQ8X6FbN9vMFUqH3NA p17klrppP8BbXsbq6/Epo1rDTQ78tV/HM6mI3rddDjG04JbXlS1tbKihdO5lk4YBFCcf s4KQ6O4Zk3fCrzGd9Dpo+1J33bdZ0d3JHKejPKtJdGnZYJn3dtzW1jOHFx+fhXVfGx38 5mkg68gNomLSbwTPCgdzhHOsXI6TxsDsZXt1kfDlsGN8GsYIxE66IElHXJhcU1bX8cpm Rekw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745959382; x=1746564182; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=BtOeI4aWd2VeJNr8MUcnFfhyV/soipsIiDitf6wqZ1Y=; b=kc53c8aJ+L+VhiggqHn9dMLL8ldWKJLwTL1bQN9D2fVIGeZTbP1CyA+BzGWAZUyogi o42TKBZ6fnUpDpGbdW3ZP7UltWjCAFtOA0vXGyBraRFtzLFL1tPfjalR+zAJXyKxkqbQ 67q0saw6+qE5q73muvbpH2k16QLhbEawIOQhSydiiQvW5/0fG3y7dS6ZxVYwHzBwTpvN JIXf6qpS4ErqMP/HasUi5wfMAKclFgFHlto81l4LSn6nSc6T7Lrm212QtxB9tsk25TNe la2Bh9uESWx34mUVfaa75H5klFIXiRZUFPgg4dSGyNBPNr0bFg+MaIuQnZqxEm4VgxD2 htow== X-Gm-Message-State: AOJu0YyeqfpHpPxvpKErqcaaK1ze5iVxEXT1dk1C4z/Ikd56KLJwTNbF HlvnUAEcgUDK1XF+cu+Y6JvKIfeUksDnMRvMekmzQCwGxAPeqQ+GQz75qfxfh90= X-Gm-Gg: ASbGnct+7yASWMHDRD+wcXg/pBFjupY28OPiLF8kyNf2ujTAMusP05U6hhsq6O1LAmp gBPx+iHZMOaepl4kjosFsqnx7w9Ar0l7bPUsV/8BWBYmHVtnkAEU4R+f9SO2YlwznYKdROuUuX7 FGpbt4KMG7xtXGf4u8PM+gBR78U/6fs5XAFYQUGz8l7i8uukTBX1hGibdN0D/3I3EdveN1TyewV hJ6f34F2Q+UwFdxQ4c3jzzY04fhanxSxkWlkZp/QPvwb+JnYzXBTd7a1AiNomdjeFBbAc2tBgo3 rlXaM10DJPaJgHIOZZZlP1XclNgUIJCPfQEgwezkcDvMVvI= X-Google-Smtp-Source: AGHT+IF986M0KB/0ukDLWoQL677z0i0Pez0JHtEEHpQHJP7erlbXj8mT3o0OF1eJIF+TerPLJhBJ5w== X-Received: by 2002:a05:6a00:2405:b0:736:ab1e:b1ab with SMTP id d2e1a72fcca58-7403a63e1d6mr100489b3a.0.1745959381909; Tue, 29 Apr 2025 13:43:01 -0700 (PDT) Received: from localhost ([116.86.61.95]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-74039a309edsm121612b3a.91.2025.04.29.13.43.00 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 29 Apr 2025 13:43:01 -0700 (PDT) From: John Khoo Date: Wed, 30 Apr 2025 04:42:45 +0800 Message-ID: <0998501bad053ba20daae94993a9f64120e114ab.1745959369.git.johnkhootf@gmail.com> X-Mailer: git-send-email 2.49.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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/textutils.scm (utf8proc-bootstrap): New variable. * gnu/packages/julia.scm (julia): Change utf8proc dependency to utf8proc-bootstrap to break dependency loop. Change-Id: Ie2e0c4a83aa9b478b125a390f162c1c69613cd9b --- gnu/packages/julia.scm | 3 ++- gnu/packages/textutils.scm | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) base-commit: 94e7afbb557d3f2709072bf2bf58618293ca7fbd diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 9668b3fd1e..9a4b38f74e 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2022 Akira Kyle +;;; Copyright © 2025 John Khoo ;;; ;;; This file is part of GNU Guix. ;;; @@ -526,7 +527,7 @@ (define-public julia ("p7zip" ,p7zip) ("pcre2" ,pcre2) ("suitesparse" ,suitesparse) - ("utf8proc" ,utf8proc-2.7.0) + ("utf8proc" ,utf8proc-bootstrap) ; Julia used for tests ("wget" ,wget) ("which" ,which) ("zlib" ,zlib) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index c886b009be..5fc21eb7ea 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2024 Sharlatan Hellseher ;;; Copyright © 2024, 2025 Ashish SHUKLA ;;; Copyright © 2024 Artyom V. Poptsov +;;; Copyright © 2025 John Khoo ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,6 +77,7 @@ (define-module (gnu packages textutils) #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-xyz) #:use-module (gnu packages java) + #:use-module (gnu packages julia) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -166,6 +168,38 @@ (define-public enca libenca and several charset conversion libraries and tools.") (license license:gpl2))) +;; Bootstrap variant of utf8proc, which breaks the dependency cycle between julia +;; and utf8proc by disabling tests and removing its native-inputs. +(define-public utf8proc-bootstrap + (hidden-package + (package + (name "utf8proc-bootstrap") + (version "2.10.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaStrings/utf8proc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1n1k67x39sk8xnza4w1xkbgbvgb1g7w2a7j2qrqzqaw1lyilqsy2")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:make-flags (list ,(string-append "CC=" (cc-for-target)) + (string-append "prefix=" (assoc-ref %outputs "out"))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + ))) + (home-page "https://juliastrings.github.io/utf8proc/") + (synopsis "C library for processing UTF-8 Unicode data") + (description "utf8proc is a small C library that provides Unicode + normalization, case-folding, and other operations for data in the UTF-8 + encoding, supporting Unicode version 16.0.0.") + (license license:expat)))) + (define-public utf8proc (package (name "utf8proc")