From patchwork Mon Apr 21 14:05:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Khoo X-Patchwork-Id: 41847 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 014BF27BC4A; Mon, 21 Apr 2025 15:06:23 +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=unavailable 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 B77CE27BC49 for ; Mon, 21 Apr 2025 15:06:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6rmd-0005gV-Of; Mon, 21 Apr 2025 10:06:03 -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 1u6rmc-0005fP-V6 for guix-patches@gnu.org; Mon, 21 Apr 2025 10:06: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 1u6rmc-000287-Lr for guix-patches@gnu.org; Mon, 21 Apr 2025 10:06: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=cqJglFNbOCG2tttNvqxkaqBHAyodHTM7KaUOU52bZQY=; b=DdLJPX8oJacouoDHcMnExCDa7Qv4MxjmtIvkviX5tOXcvn4/4xOxfJtwUmppGnvspcNx+FC02bW22XgRTjhqWL0Pn/OvY5YwXDBpEXkBjlWUJNumSvQ757V2HF6hXmkthnE+UVQTiXGLLWveHtboQAFaenAjiasiSQi+Kz1W5Fezaz7GXbYdFwpIB0Enx4LTVz0N9qLAC/nOKkir+mJ9u9YfF4zqex4YA7bVL/NaSEqeq6RAjNO34SBtzpWxYHdgumski8FGsdmLIBYuG5fSs/Rw1Vk6hOFu7/9QleOxNs1loUB6MktMCJdFinu/vcF96Xji93P1ts7YS0zr2v4J5A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6rmc-0001VK-Et; Mon, 21 Apr 2025 10:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77949] [PATCH v2 1/3] gnu: utf8proc: Update to 2.10.0. References: In-Reply-To: Resent-From: John Khoo Original-Sender: "Debbugs-submit" Resent-CC: zimon.toutoune@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 21 Apr 2025 14:06:02 +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 , Simon Tournier X-Debbugs-Original-Xcc: Simon Tournier Received: via spool by 77949-submit@debbugs.gnu.org id=B77949.17452443395689 (code B ref 77949); Mon, 21 Apr 2025 14:06:02 +0000 Received: (at 77949) by debbugs.gnu.org; 21 Apr 2025 14:05:39 +0000 Received: from localhost ([127.0.0.1]:35699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6rmD-0001TW-Pi for submit@debbugs.gnu.org; Mon, 21 Apr 2025 10:05:39 -0400 Received: from mail-pj1-x102f.google.com ([2607:f8b0:4864:20::102f]:42136) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u6rmA-0001Si-4M for 77949@debbugs.gnu.org; Mon, 21 Apr 2025 10:05:35 -0400 Received: by mail-pj1-x102f.google.com with SMTP id 98e67ed59e1d1-30820167b47so3700966a91.0 for <77949@debbugs.gnu.org>; Mon, 21 Apr 2025 07:05:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745244327; x=1745849127; 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=cqJglFNbOCG2tttNvqxkaqBHAyodHTM7KaUOU52bZQY=; b=YkB8eStNbN1yyBNKGMEYFhyNX9cC4FImtZtIIita24nvJMN1GUdaKBRMfbBtNDy+8/ O5g7YuLPV4ny6ig5ZQtETu2stEKKGbjkHCUwr7XTl8v3VUptK5ZgJQ5AA/CSgczlVaN4 iN1URAFKETSD224bV1DcfH4Exu8gTdnu7p9EXJfD5WHuuL4idK9meUj53+l6UNjhRZPb yRL4r8lwVF7ByF6gDk/0D3DU/LvgHCk+Rx1O43dV9ct9xm0lqVQKO6uB8/Lvnt94ASZe N91OQJ+Fkymxuh3CgF8eWXCfdgl3X6iTfIWbJMFLbAIj+ZyzYUnf90HLNq7dTPYltrc1 an5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745244327; x=1745849127; 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=cqJglFNbOCG2tttNvqxkaqBHAyodHTM7KaUOU52bZQY=; b=OdKtpDazEE9o5xAQrjg4YjMFg/03VWsTXTTvTmlUsxigfsdVBHobVwMlKC8H10VJb6 k9vtvTAMuUTpliHsKw6DyfPpcb4oEWJaHGkT1h3qWmbOoffxqU2C1cEvTIl2D62JY5/J LTLAQtIyohwqOnDUSIOnXB3BAZ53h/ZJWRiw/ApC7N9WHz1ZWQeaENoZsQsJXhH6z1LY pdv5F3VH2eKgygcFuxrN2fDTu8Lbfu3z1ZZ6vCjH2Asa3MhLEyy9IgPgMxN3IN7II6/w +I7FeS6hzFdfZGqwmQ+p8ehUbY8k+2haCR8znwWwi30dqutQcqlJz45No8gesLbBb4pK IiCQ== X-Gm-Message-State: AOJu0YzzCqPm6LqR1d9HoOFadfDYU5FsAu6iN5730dea3NnjijhjWiGp 39Wc/U7OklqmXaT/hwykJg3disziaPrf+0X74soLdp6LWiJgwx1Tf7K18VM2zTU= X-Gm-Gg: ASbGnct8/TdmmUO5bpQbxWqMpmpDY1p2ummXgsbW6S//UBdA2B8/ROtKP8Cowq2w3xL rvfdutQy2jDNctxK+wipxsAmz+O3Ywwr2+rfX2agEUBalN0b1P+nhKyXYaaMBbqQ8Q+whvrBNf4 KSyX/GuMqZeX+vg+KTB7RMHxgkJTLTonzcTyAMkmjfOkvp/84y0AaAIsT7GJzNvEC+Zs1DTCkdY q9ZwccPjOKcp33gx35VOuw0s5JYlUxvhtg2yZ3c401NlXpe4NL81LFxaq3D4Kw4kJurQDcve1dm 9GwWjehnwXj6dBifPA++uFeaOhx6UKDgzLJM X-Google-Smtp-Source: AGHT+IHhG+yAwZ3chffrBH2odBMaxOkWouWymuvA5zl2pO0Z1BMFGG26sUxh1UAGPXnDGjTjbegmEw== X-Received: by 2002:a17:90b:3cd0:b0:2fa:3174:e344 with SMTP id 98e67ed59e1d1-30879c02d1amr17888443a91.14.1745244326972; Mon, 21 Apr 2025 07:05:26 -0700 (PDT) Received: from localhost ([116.86.61.95]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-3087e1149b1sm6582730a91.40.2025.04.21.07.05.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Apr 2025 07:05:26 -0700 (PDT) From: John Khoo Date: Mon, 21 Apr 2025 22:05:15 +0800 Message-ID: <4c272d92f62b18882fe0e6868f6c61a0291071df.1745244317.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): Add new utf8proc-bootstrap package to break dependency loop with Julia, and update to 2.10.0. * gnu/packages/julia.scm (julia): Change utf8proc dependency to utf8proc-bootstrap to break dependency loop. Change-Id: I5b75b8de3803032d423ba055a62c39801dd2cf47 --- gnu/packages/julia.scm | 3 +- gnu/packages/textutils.scm | 134 ++++++++++++++++--------------------- 2 files changed, 60 insertions(+), 77 deletions(-) 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..1814490e97 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) @@ -89,7 +91,8 @@ (define-module (gnu packages textutils) #:use-module (gnu packages ruby) #:use-module (gnu packages slang) #:use-module (gnu packages web) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (srfi srfi-1)) (define-public dos2unix (package @@ -166,22 +169,44 @@ (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 + (inherit utf8proc-bootstrap) (name "utf8proc") - (version "2.5.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 "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq")))) - (build-system gnu-build-system) - (native-inputs - (let ((UNICODE_VERSION "13.0.0")) ; defined in data/Makefile + (native-inputs ;; For tests. + (let ((UNICODE_VERSION "16.0.0")) ; defined in data/Makefile ;; Test data that is otherwise downloaded with curl. `(("NormalizationTest.txt" ,(origin @@ -189,7 +214,7 @@ (define-public utf8proc (uri (string-append "https://www.unicode.org/Public/" UNICODE_VERSION "/ucd/NormalizationTest.txt")) (sha256 - (base32 "07g0ya4f6zfzvpp24ccxkb2yq568kh83gls85rjl950nv5fya3nn")))) + (base32 "1cffwlxgn6sawxb627xqaw3shnnfxq0v7cbgsld5w1z7aca9f4fq")))) ("GraphemeBreakTest.txt" ,(origin (method url-fetch) @@ -197,57 +222,26 @@ (define-public utf8proc UNICODE_VERSION "/ucd/auxiliary/GraphemeBreakTest.txt")) (sha256 - (base32 "07f8rrvcsq4pibdz6zxggxy8w7zjjqyw2ggclqlhalyv45yv7prj")))) - + (base32 "1d9w6vdfxakjpp38qjvhgvbl2qx0zv5655ph54dhdb3hs9a96azf")))) + ("DerivedCoreProperties.txt" + ,(origin + (method url-fetch) + (uri (string-append "https://www.unicode.org/Public/" + UNICODE_VERSION "/ucd/DerivedCoreProperties.txt")) + (sha256 + (base32 "1gfsq4vdmzi803i2s8ih7mm4fgs907kvkg88kvv9fi4my9hm3lrr")))) ;; For tests. - ("perl" ,perl)))) + ("perl" ,perl) + ("ruby" ,ruby-2.7) + ("julia" ,julia)))) (arguments - `(#:make-flags (list ,(string-append "CC=" (cc-for-target)) - (string-append "prefix=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'check 'check-data - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) - (for-each (lambda (i) - (copy-file (assoc-ref ,@(if (%current-target-system) - '((or native-inputs inputs)) - '(inputs)) i) - (string-append "data/" i))) - '("NormalizationTest.txt" "GraphemeBreakTest.txt")) - (substitute* "data/GraphemeBreakTest.txt" - (("÷") "/") - (("×") "+")) - #t))))) - (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 9.0.0.") - (license license:expat))) - -(define-public utf8proc-2.7.0 - (package - (inherit utf8proc) - (name "utf8proc") - (version "2.7.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 "1wrsmnaigal94gc3xbzdrrm080zjhihjfdla5admllq2w5dladjj")))) - (arguments - (substitute-keyword-arguments (package-arguments utf8proc) + (substitute-keyword-arguments (package-arguments utf8proc-bootstrap) + ((#:tests? _ #f) + (not (%current-target-system))) ((#:phases phases) - `(modify-phases ,phases - (replace 'check-data + `(modify-phases %standard-phases + (delete 'configure) + (add-before 'check 'check-data (lambda* (#:key inputs native-inputs #:allow-other-keys) (display native-inputs) (for-each (lambda (i) @@ -255,19 +249,7 @@ (define-public utf8proc-2.7.0 (string-append "data/" i))) '("NormalizationTest.txt" "GraphemeBreakTest.txt" "DerivedCoreProperties.txt")))))))) - (native-inputs - (append - (package-native-inputs utf8proc) - (let ((UNICODE_VERSION "14.0.0")) - `(("DerivedCoreProperties.txt" - ,(origin - (method url-fetch) - (uri (string-append "https://www.unicode.org/Public/" - UNICODE_VERSION "/ucd/DerivedCoreProperties.txt")) - (sha256 - (base32 "1g77s8g9443dd92f82pbkim7rk51s7xdwa3mxpzb1lcw8ryxvvg3")))) - ;; For tests - ("ruby" ,ruby-2.7))))))) + (properties (alist-delete 'hidden? (package-properties utf8proc-bootstrap))))) (define-public libconfuse (package From patchwork Mon Apr 21 14:05:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Khoo X-Patchwork-Id: 41848 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 62C2B27BC4B; Mon, 21 Apr 2025 15:06:29 +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 EB27227BC4A for ; Mon, 21 Apr 2025 15:06:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6rml-0005iM-JV; Mon, 21 Apr 2025 10:06:11 -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 1u6rmj-0005i3-OY for guix-patches@gnu.org; Mon, 21 Apr 2025 10:06:09 -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 1u6rmj-00028P-DW for guix-patches@gnu.org; Mon, 21 Apr 2025 10:06:09 -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:References:In-Reply-To:Date:From:To:Subject; bh=vwai7IxXrDWBNB5Jn0NbrWx4XjPVCIEqguvsKjXkm/U=; b=ZWna89aicSckAZrf6ock1KdxmrXC9OOYc7aQS1eDoKJAaHb390BsjapTjGKjxVP9QclPhyEDIAOaWWo4hFtePB4rVEJuqzwKhSk9+9R6bvr3nSeGTgsy0WpBv+JHR8B20ryoQineXAR2tDRJmYvCDTuYkV5CpF9aADgPp2QZdcRK76BsRqkAkmfYGIzm5tjz+jW264DFSIJMnitaXcbWVKvbmk4vsiRwSVON9WBqCzLsWwcy7vhKuC0ZttUY+u2/HLl1gUAVSvvG5mZY5NaPVeL8gHAjDuE3UokPmZwfMiUoOje5DQ/DhIDEniTBSfMT/cIdpqR488sOsVfw4DTXbA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6rmd-0001VT-20; Mon, 21 Apr 2025 10:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77949] [PATCH v2 2/3] gnu: tree-sitter: Update to 0.25.3. Resent-From: John Khoo Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, csantosb@inventati.org, divya@subvertising.org, hako@ultrarare.space, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Mon, 21 Apr 2025 14:06:03 +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 , Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Cayetano Santos , Divya Ranjan Pattanaik , Hilton Chain , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 77949-submit@debbugs.gnu.org id=B77949.17452443445722 (code B ref 77949); Mon, 21 Apr 2025 14:06:03 +0000 Received: (at 77949) by debbugs.gnu.org; 21 Apr 2025 14:05:44 +0000 Received: from localhost ([127.0.0.1]:35702 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6rmJ-0001UC-EU for submit@debbugs.gnu.org; Mon, 21 Apr 2025 10:05:43 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]:55428) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u6rmD-0001Sv-6a for 77949@debbugs.gnu.org; Mon, 21 Apr 2025 10:05:39 -0400 Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-2240b4de12bso58404035ad.2 for <77949@debbugs.gnu.org>; Mon, 21 Apr 2025 07:05:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745244330; x=1745849130; 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=vwai7IxXrDWBNB5Jn0NbrWx4XjPVCIEqguvsKjXkm/U=; b=IxneMsgZUsTKr46JoBJMOOD72Q8xV2Drj4zgIcOriCFjTKdobXN6Wnxaqm3Q3FcgsO sL52Suo6xZJhHEqiXWe80Xa00It45Vy5gE2RqE7Ge+r1aoWwmSTVoT0S6M2e0UBd82ng 1DjhWN6HU08Oo30eqHfiYhU+lpV6sG756lgFA0l4rQEzZyC8p9bXq2orCT4S3MNAjTsf TLCbHmLCfnyblDDNdK+Cb8RFl2wWlPu9h+B0gvbixYQIlRCry5G/hAs/ng9PfKqGj/lj VzvRtOpAjcbwikwxdpdu++iT32+NJ6BWrXBhusE27+v23c074S1c2CFRYsaNW2zo3eg0 Amhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745244330; x=1745849130; 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=vwai7IxXrDWBNB5Jn0NbrWx4XjPVCIEqguvsKjXkm/U=; b=eG5xnzmrdAyvZqGvSjyyO15cqxukrGx+RCcGefUhsZY1/6hqsTJ1OZWpCcDytDz4/I G20s2b1XuQnMs3DlhMEoXfK88/VhsSJQKy9Xyw7EXygR/dho7V/15LWOAoUK6+CgmKss P+wCfIBi9a2/64PXTLKTXM4GDO0cyhVe2Awa1D25uV4+nriByfu5oilLQ2+04x3D7G7e 7/Eqp7TOuFsfiw4cIRRLiAH83BifwCjnY52By1Erdkrzgy/V8ZCtD5hExw5EOr+8AY4d Rm0yDFZxGD7y7HYaXBoiCYzLgwaeBn1e6t9OhzLiMMbK8ZhFH87fYdYVcjEabCStW8rD KagA== X-Gm-Message-State: AOJu0YwYz3DaRu3ZmOSguTCY9tJmOsbJ1jLvxw/YKWw7UVLfW3ucxPCh iFWCGz/+KEpD0QkguWJVdN6NZFKHhGVyvLBH11oaEthJkCwLue+kJsGTIXtI7fk= X-Gm-Gg: ASbGncv79gxH9833qY3KTnaIW6g6CKAI/4iVPFrdZ4KpY47tGW9p9v8Av4FKbgz03BK yrG4st5P6gWAur+uK6JvWxDs8yj2HveAGKGlXxH6XKYw0OAtXKXRDLxYE5/AA/p8OcwbM0ng5hD 6sTvTUwR7n/9x1rNoIoQbkyj7TkNRHc8VJ+XTfyhbnjNsS3W0wV7LKCZgJwUOe++rlc9npPK1ML BHYnaBBAf/eTpWMAkeu4svlPSWR/KtlpC7GjCvnVnhjsLEpjsEa+eILixZ9fRK082yKU3sM+UKC kqhRm2Nnb7yCgLzQvncBVoKFAINbHWRpOEpG X-Google-Smtp-Source: AGHT+IGgwadW3JGrjLfqEhYOymkIubS1rZu1SClyQdgSN4CksuKH0YqA4PQpdjYwIauix/e3zaLMHA== X-Received: by 2002:a17:903:1c1:b0:21f:7a8b:d675 with SMTP id d9443c01a7336-22c53285bc6mr192972805ad.4.1745244330198; Mon, 21 Apr 2025 07:05:30 -0700 (PDT) Received: from localhost ([116.86.61.95]) by smtp.gmail.com with UTF8SMTPSA id d9443c01a7336-22c50eb48a4sm65767255ad.133.2025.04.21.07.05.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Apr 2025 07:05:29 -0700 (PDT) From: John Khoo Date: Mon, 21 Apr 2025 22:05:16 +0800 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: <4c272d92f62b18882fe0e6868f6c61a0291071df.1745244317.git.johnkhootf@gmail.com> References: <4c272d92f62b18882fe0e6868f6c61a0291071df.1745244317.git.johnkhootf@gmail.com> 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/tree-sitter.scm (tree-sitter): Update to 0.25.3. Change-Id: I5428c1fc180af0a391286f2bcb2ee48746885486 --- gnu/packages/tree-sitter.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index 19e32f53f1..6fa24d5b2a 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2023, 2024 Nicolas Graves ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023, 2024 Raven Hallsby +;;; Copyright © 2025 John Khoo ;;; ;;; This file is part of GNU Guix. ;;; @@ -101,16 +102,16 @@ (define-public python-tree-sitter (define-public tree-sitter (package (name "tree-sitter") - (version "0.20.10") ;untagged + (version "0.25.3") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/tree-sitter/tree-sitter") - (commit "0e4ff0bb27edf37b76fc7d35aa768b02cf4392ad"))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1bai4gdhf8w5p1i9np2kl2ms0jq6rgq98qpiipipzayb9jjjlxcy")) + "0cck2wa17figxww7lb508sgwy9sbyqj89vxci07hiscr5sgdx9y5")) (modules '((guix build utils))) (snippet #~(begin ;; Remove bundled ICU parts From patchwork Mon Apr 21 14:05:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Khoo X-Patchwork-Id: 41846 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 4079F27BC4A; Mon, 21 Apr 2025 15:06:22 +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 E0B5B27BC4B for ; Mon, 21 Apr 2025 15:06:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u6rmf-0005hB-3M; Mon, 21 Apr 2025 10:06: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 1u6rme-0005gh-0v for guix-patches@gnu.org; Mon, 21 Apr 2025 10:06:04 -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 1u6rmd-00028D-Oj for guix-patches@gnu.org; Mon, 21 Apr 2025 10:06:03 -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:References:In-Reply-To:Date:From:To:Subject; bh=6OMSladexCFPf9kZ3sXjelfONl1UKHh9uwl8ZkzsSEI=; b=TzK/okrX7ihIrYVwnj2GuNTXBdh0UsiKc2gm+OxMSeI1U1YrRHK3bhfPlnfUmH4IQbTjbl43JFjSMyTDwU/q5Qq/XN/7BuHKYGkZzC55fRwTz6g/riHTIUhvro956tvDTqrThqzRH2iswAy3GoUaAFpls+QMwmaNHaIIpe5Df1PLbl1bTLTAQHvbgOVV4M93+byEeIqcCh6hlt+Pn+fz/8FSGS63Z90QKFcIHdworQYkfQZbsiWlCWMI1w2uHFBAe+SldsNyklRFjfo+8glLE9+72nUhcj4j/xzmQ+EqnOC39v5YaQCGTW+c0bTiNB9pq2swmQzoOXXEnDa4v2P+Hw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u6rmd-0001VZ-JG for guix-patches@gnu.org; Mon, 21 Apr 2025 10:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77949] [PATCH v2 3/3] gnu: neovim: Update to 0.11.0. Resent-From: John Khoo Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 21 Apr 2025 14:06:03 +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 Received: via spool by 77949-submit@debbugs.gnu.org id=B77949.17452443445732 (code B ref 77949); Mon, 21 Apr 2025 14:06:03 +0000 Received: (at 77949) by debbugs.gnu.org; 21 Apr 2025 14:05:44 +0000 Received: from localhost ([127.0.0.1]:35704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u6rmJ-0001UF-Ta for submit@debbugs.gnu.org; Mon, 21 Apr 2025 10:05:44 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]:54599) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u6rmG-0001T7-9t for 77949@debbugs.gnu.org; Mon, 21 Apr 2025 10:05:41 -0400 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-af6a315b491so3433390a12.1 for <77949@debbugs.gnu.org>; Mon, 21 Apr 2025 07:05:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745244334; x=1745849134; 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=6OMSladexCFPf9kZ3sXjelfONl1UKHh9uwl8ZkzsSEI=; b=TZv0aS6AAjqVr8blzJ6rc36L2CSQ1HuG3CTfhCL/2bq1AxmVdvn521PcS1TFPpqBfn eQWEXg0rCu/fMqKWoRaaL1JM57kKrfFwi1HX5/viUsXuZL3/ipYbGYjPsuEg3zgto/qD IabPn23vpcN56MMw78UOWRZvBX+5UfGpZScJ2y4joR0pAe3mJXEhbHHV6+n4m5okfW8T ByGvnelrG/RfXm/k7hVv7tKV59zCsrcwbC0jc13Kx/bGfGo9PJGp0fPMrSy7BZLPAf40 v//ZE4pwLrme6iVQTKcHvRYUuMMjAd5wpKVLO/0h/6k9H5UHvE7oFXbUJH9aKb5v1CR6 DSsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745244334; x=1745849134; 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=6OMSladexCFPf9kZ3sXjelfONl1UKHh9uwl8ZkzsSEI=; b=BNKSGlPK2CQ+iYadMk7YLvdGk3yJBV+AAkUmfFjYOL/xKby4U8NVrEnYRwC2GJEmhl oDzERd2J49IrD79snpzCBiEjCyRL+qlhhMfFG+c9fVnRsFk2ZP/FABdQR/tEfbwX+2Ns eoY6LbKoPVog7WMjXFv3WbpQ5It9ZYCn/psz0e5hx7MBhVJVGbtjUBiqOVQwPm+1Arih RUC8CtUtZiU1hNO2k16Ogi/aE0KZ/bD9SESzLOLkYjuRZHjcmLDJx98PxKhaBU5AMKFz EQXaeXtqr3szsLFez+mq7eRHtXl1nThlBSujFhXEv8J71xx1L+HK7HfqeHOiBkN6iGQz sn6w== X-Gm-Message-State: AOJu0Yzu0gbhNgC+ubMUNMMqkMJ3dXzggjwS23qgNeU7Vdf1A3n+dR2P YcJ2oS3JHJub8Hef43cawp3k1iyeGdJThpprVIEuuddnUSIQCUag/kG+7kZsUJM= X-Gm-Gg: ASbGnctcsZ+ZANWtE/zeyb3jeundikGj5pydB6FJXdksEPKTsuzhcpX3IeBdJqRNhxJ EtKEOpEN9ix5N2HUal01l9o7/ASMOO1I7joGpz8O8QJjC7KR0HigrcpEq5fJkorpnCSViSqHiOD LD5VC6fAAy//ryU6NrGoluxs9+OhT4jF0LPVOl2RCT1F6FfFqRvSgWDnQXAdw6jTQ7I4pEZSj/D qs+2LT1+FvbKzCH5uwiPbK9w4Y/TsA9QG8EFrnRkr4izdIicgXKxaJvekD479/uyb5S8+YlFU0F PPbwE/5pfTjC7izd+/RiBEZCOmsJDGoHOF4j X-Google-Smtp-Source: AGHT+IFpvN3icc0h333iyb+JUzJxhqwbqX2F1Lm08VixSUcQtZ5h2/eWhnJQWLFDMgntiFGuDqAG3A== X-Received: by 2002:a05:6a20:2d29:b0:1fd:f8eb:d232 with SMTP id adf61e73a8af0-203cbc69a21mr16319619637.24.1745244333544; Mon, 21 Apr 2025 07:05:33 -0700 (PDT) Received: from localhost ([116.86.61.95]) by smtp.gmail.com with UTF8SMTPSA id 41be03b00d2f7-b0db13a41a2sm5571234a12.21.2025.04.21.07.05.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 21 Apr 2025 07:05:33 -0700 (PDT) From: John Khoo Date: Mon, 21 Apr 2025 22:05:17 +0800 Message-ID: <4e82024ecdbd44a2e0bc48274dcd85a58ce0a859.1745244317.git.johnkhootf@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <4c272d92f62b18882fe0e6868f6c61a0291071df.1745244317.git.johnkhootf@gmail.com> References: <4c272d92f62b18882fe0e6868f6c61a0291071df.1745244317.git.johnkhootf@gmail.com> 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/vim.scm (neovim): Update to 0.11.0. Change-Id: I278b533b2ff13e2b40652ce451c9924fc729df5a --- gnu/packages/vim.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index c921426b7f..bf82301228 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2023 Charles Jackson ;;; Copyright © 2023 Foundation Devices, Inc. ;;; Copyright © 2023, 2024 Nguyễn Gia Phong +;;; Copyright © 2025 John Khoo ;;; ;;; This file is part of GNU Guix. ;;; @@ -79,6 +80,7 @@ (define-module (gnu packages vim) #:use-module (gnu packages shells) #:use-module (gnu packages tcl) #:use-module (gnu packages text-editors) + #:use-module (gnu packages textutils) #:use-module (gnu packages terminals) #:use-module (gnu packages tree-sitter) #:use-module (gnu packages xdisorg) @@ -782,7 +784,7 @@ (define-public neovim-packer (define-public neovim (package (name "neovim") - (version "0.9.5") + (version "0.11.0") (source (origin (method git-fetch) (uri (git-reference @@ -791,7 +793,7 @@ (define-public neovim (file-name (git-file-name name version)) (sha256 (base32 - "1j3z7jay0m6g06v04falrzr062g07xr4svbrc3hywlqi2h6rrvk5")))) + "1z7xmngjr93dc52k8d3r6x0ivznpa8jbdrw24gqm16lg9gzvma02")))) (build-system cmake-build-system) (arguments (list #:modules @@ -849,6 +851,7 @@ (define-public neovim libtermkey libvterm unibilium + utf8proc jemalloc (if (member (if (%current-target-system) (gnu-triplet->nix-system (%current-target-system))