From unknown Tue Jun 17 22:27:16 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78212] [PATCH 0/2] Update sqlite3, and fossil to 3.49.1, and 2.26.0. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 May 2025 13:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78212 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78212@debbugs.gnu.org Cc: Ashish SHUKLA X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174619378014717 (code B ref -1); Fri, 02 May 2025 13:50:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 May 2025 13:49:40 +0000 Received: from localhost ([127.0.0.1]:57617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uAqlm-0003pE-QQ for submit@debbugs.gnu.org; Fri, 02 May 2025 09:49:40 -0400 Received: from lists.gnu.org ([2001:470:142::17]:38272) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uAqlb-0003oY-OT for submit@debbugs.gnu.org; Fri, 02 May 2025 09:49:33 -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 1uAqlU-0004rC-VJ for guix-patches@gnu.org; Fri, 02 May 2025 09:49:21 -0400 Received: from anamika.lostca.se ([65.21.75.227]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAqlR-0006gK-1G for guix-patches@gnu.org; Fri, 02 May 2025 09:49:19 -0400 Received: from bob.inet6.fi (bob.inet6.fi [IPv6:2a0a:4cc0:0:1325::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 0FB9F1E4F8; Fri, 2 May 2025 13:49:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1746193754; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=h5nBqrH2gkNhnhdac7K7+AaeKUgCqPS1iXXfjkBVIwc=; b=jSztdwdPlGqLJBjKPJq4fT+kRB9VoNUZFGEZBsMmnGMEUp3mPanXbwi6x2D5cBsSxhRltB rLTbQxvhZKqo9IrXcsfVdfd1dibnCInbNUtEoB+QIzHt3+qDXNatKPr+FaZf4yJE7uZiLM yuzII7QNBrUOnDPLwMkBIM8rGRoOtlY= From: Ashish SHUKLA Date: Fri, 2 May 2025 13:47:40 +0000 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=65.21.75.227; envelope-from=ashish.is@lostca.se; helo=anamika.lostca.se X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.9 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) This patch series updates sqlite, and fossil to their latest stable versions. Ashish SHUKLA (2): gnu: sqlite: Update to 3.49.1. gnu: fossil: Update to 2.26. gnu/packages/sqlite.scm | 34 +++++++++++++++++++++++++------- gnu/packages/version-control.scm | 4 ++-- 2 files changed, 29 insertions(+), 9 deletions(-) base-commit: 3ca90163f7c232ab5f093f824be9e8e07b9f4ddd -- 2.49.0 From unknown Tue Jun 17 22:27:16 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78212] [PATCH 1/2] gnu: sqlite: Update to 3.49.1. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 May 2025 13:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78212 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78212@debbugs.gnu.org Cc: Ashish SHUKLA Received: via spool by 78212-submit@debbugs.gnu.org id=B78212.174619388215386 (code B ref 78212); Fri, 02 May 2025 13:52:02 +0000 Received: (at 78212) by debbugs.gnu.org; 2 May 2025 13:51:22 +0000 Received: from localhost ([127.0.0.1]:57637 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uAqnR-000406-C5 for submit@debbugs.gnu.org; Fri, 02 May 2025 09:51:21 -0400 Received: from anamika.lostca.se ([2a01:4f9:3b:505c::2]:41728) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uAqnN-0003ze-E0 for 78212@debbugs.gnu.org; Fri, 02 May 2025 09:51:18 -0400 Received: from bob.inet6.fi (bob.inet6.fi [IPv6:2a0a:4cc0:0:1325::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id 786031E4FC; Fri, 2 May 2025 13:51:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1746193869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ujLzUZwAfh7A4+JPZg80FZVrYf+K5GJQArEPmLeoloc=; b=XMwcw/g92GzeFr/RPeMXUS9JfNHXpTnMf/8E1QlkZYXXeMjF82snUSOYcxzXZoiOkTNwQA SnGatIjulKXkLqZZq5FTUt/dOte9whv2+MCk0TMzyw0hH/Brx8G36Si4PWeUzlgRPMGorg LElsru/jfWxAUmMcyyilGur4pjkt4KA= From: Ashish SHUKLA Date: Fri, 2 May 2025 13:51:02 +0000 Message-ID: <22cae4fcdf431cda907aa00892226530471501ec.1746193607.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/sqlite.scm (sqlite)[#:phases]: Update to check for the existence of file before patching it. * gnu/packages/sqlite.scm (sqlite-next): Update to 3.49.1. Add arguments. Change-Id: I74f8bb57090a050eb2e0c8cb5a1d4910efa714d5 --- gnu/packages/sqlite.scm | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/gnu/packages/sqlite.scm b/gnu/packages/sqlite.scm index dd21db0921..5b30865b08 100644 --- a/gnu/packages/sqlite.scm +++ b/gnu/packages/sqlite.scm @@ -38,6 +38,7 @@ (define-module (gnu packages sqlite) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix deprecation) #:use-module (ice-9 match) @@ -99,10 +100,10 @@ (define-public sqlite ;; Remove reference to the static library from the .la file ;; so that Libtool looks for it in the usual places. - (substitute* (string-append out "/lib/libsqlite3.la") - (("^old_library=.*") - "old_library=''\n")) - #t)))))) + (when (file-exists? (string-append out "/lib/libsqlite3.la")) + (substitute* (string-append out "/lib/libsqlite3.la") + (("^old_library=.*") + "old_library=''\n"))))))))) (home-page "https://www.sqlite.org/") (synopsis "The SQLite database management system") (description @@ -116,10 +117,29 @@ (define-public sqlite (define-public sqlite-next (package (inherit sqlite) - (version "3.46.0") + (version "3.49.1") + (arguments + (cons* + ;; disable tests; no check/test target + #:tests? #f + (substitute-keyword-arguments (package-arguments sqlite) + ((#:configure-flags flags #~(list)) + #~(map (lambda (flag) + (if (string-prefix? "CFLAGS=" flag) + ;; enable for fossil + (string-append flag " -DSQLITE_ENABLE_FTS4") + flag)) + #$flags)) + ((#:phases phases #~(list)) + #~(modify-phases #$phases + (add-after 'unpack 'patch-unknown-option-check + (lambda _ + (substitute* "autosetup/autosetup" + (("user-error \"Unknown option" all) + (string-append "# " all)))))))))) (source (origin (method url-fetch) - (uri (sqlite-uri version 2024)) + (uri (sqlite-uri version 2025)) (sha256 (base32 - "0zbs853s8ly693qdg0l7vs4shwn3plmvdczr2s478wsj6dxnm3kg")))))) + "0m4jnnbpypixmkz5pkss470gf6dpx5942kmn4drmyv5krkc44rhh")))))) -- 2.49.0 From unknown Tue Jun 17 22:27:16 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#78212] [PATCH 2/2] gnu: fossil: Update to 2.26. Resent-From: Ashish SHUKLA Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 May 2025 13:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78212 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78212@debbugs.gnu.org Cc: Ashish SHUKLA Received: via spool by 78212-submit@debbugs.gnu.org id=B78212.174619388415395 (code B ref 78212); Fri, 02 May 2025 13:52:03 +0000 Received: (at 78212) by debbugs.gnu.org; 2 May 2025 13:51:24 +0000 Received: from localhost ([127.0.0.1]:57639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uAqnT-00040E-79 for submit@debbugs.gnu.org; Fri, 02 May 2025 09:51:23 -0400 Received: from anamika.lostca.se ([65.21.75.227]:38260) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uAqnN-0003zh-E8 for 78212@debbugs.gnu.org; Fri, 02 May 2025 09:51:20 -0400 Received: from bob.inet6.fi (bob.inet6.fi [IPv6:2a0a:4cc0:0:1325::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: abbe) by anamika.lostca.se (Postfix) with ESMTPSA id EF36D1E4FE; Fri, 2 May 2025 13:51:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1746193871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XpBf8AaUznsCd3KGLI4aF8EMGfwhyM6MYjsDhG5fsaU=; b=hnRc1ObUxFDGX4mtCbTTNhvkBsrQtX1JxBG0TaU7dux2fAlUDkXFOM2IBWwlbTUw1Dd6CV wYvpo1sAeondTXGG/uNTLT7LjndpYyrlS87VQ2YKZ2CyMkdH/yCfnX33ZJeIjdaio5zSvj vMLL3NdLsKi8fa3vPgg3G3X3uFr0YW4= From: Ashish SHUKLA Date: Fri, 2 May 2025 13:51:03 +0000 Message-ID: <52519086ca0bc03181d2690084d8263829c80fd9.1746193607.git.ashish.is@lostca.se> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/version-control.scm (fossil): Update to 2.26. Change-Id: I3ffbac667d9311fdc840f1594dff58cc1a3d3b0d --- gnu/packages/version-control.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index ed96b524f8..babbe21c1f 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3603,7 +3603,7 @@ (define-public git-annex-remote-rclone (define-public fossil (package (name "fossil") - (version "2.25") + (version "2.26") (source (origin (method url-fetch) @@ -3611,7 +3611,7 @@ (define-public fossil "https://fossil-scm.org/home/tarball/version-" version "/fossil-" version ".tar.gz")) (sha256 - (base32 "18gws90by2q6a6rk7h3mx46pn79lz4zi3saxlyrdz5982mw9rvp4")))) + (base32 "1akj5dabjym2zinxp4gqc649hcvbavb41bb9bm8c9m41w64gfd5v")))) (build-system gnu-build-system) (native-inputs (list tcl ;for configuration only -- 2.49.0