From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id 8DCABFE2TWbRgwEAqHPOHw:P1 (envelope-from ) for ; Wed, 22 May 2024 02:03:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 8DCABFE2TWbRgwEAqHPOHw (envelope-from ) for ; Wed, 22 May 2024 02:03:29 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=Z98X5d02; 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=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1716336209; h=from:from:sender:sender:reply-to: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=huxyI8UkNLWyuFH2UdroSJ8t0iGYbPyv3ANHEN+MltY=; b=rG8nJfnkVnPqqmr1PxKNHs/R9BzOBys6kddOyf1/eO+zIVz9zn1k6okRXZ2b27tuw6cBaJ Fmh7QO0blrhvzgUtSDbxko0dctlna9Q7JMNsbOlxMjp0BvvcvppvHXJRR9AwAkoor9JOzi CpJ9ORdU5uYD62ftX+zW7bchvIE2NFeY9lT1SjIcStRe4EUB8DeHcKHmyeoNmKYJpXQJQQ 6+zVjISTniH2RRp7ncDJDWgAl5ZKwQ92vgJa5+iDOjPEp97uYsgVntIh+gWntkLuHw6JLU Lln/3AosOykxGGzMG45vVdjkNL8JW/G8uXaHVf3CDD78upd1vPs5zGV4XSVvbw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lostca.se header.s=anamika header.b=Z98X5d02; 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=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1716336209; a=rsa-sha256; cv=none; b=fmM0makYxuE0mj4PyH1orIiCA51d2SNHLS480IkXy6jCXd9izvmnTmX5raXeMBc4UdS38j ctqYUTUCBps2d0fZI026oWnoeG3pyizF1mID6Q0JdWE+3mCxXdEEegSWmEGYmjXM1N1a9n xQY0TvAwERkdaixKMSf/xpaof5tNNpA2vEoC2PPBogdz+B1qlEFDjFtmB//CnanWIBfES4 zZP/Q9vIVu+0t8gVjCQTqMSzV5NUY1bYvS0GWCO5WCJVvv6PwgRv+pD03j7R3BSOqPrRXi nF4GaCxDbyVOUw1i0VXa3vvPFYXsqGbjHGL8SSkGZOTe1DhMuzVkOX7KO4NYTw== 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 BA92361AAB for ; Wed, 22 May 2024 02:03:28 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s9ZRa-0005pE-Rh; Tue, 21 May 2024 20:02:58 -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 1s9ZRY-0005oT-V0 for guix-patches@gnu.org; Tue, 21 May 2024 20:02:57 -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 1s9ZRY-0005m0-MT for guix-patches@gnu.org; Tue, 21 May 2024 20:02:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s9ZRd-0008CV-V6 for guix-patches@gnu.org; Tue, 21 May 2024 20:03:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70389] [PATCH v2] gnu: fossil: Update to 2.24. Resent-From: ashish.is@lostca.se Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 May 2024 00:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70389 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70389@debbugs.gnu.org Cc: Ashish SHUKLA Received: via spool by 70389-submit@debbugs.gnu.org id=B70389.171633616931515 (code B ref 70389); Wed, 22 May 2024 00:03:01 +0000 Received: (at 70389) by debbugs.gnu.org; 22 May 2024 00:02:49 +0000 Received: from localhost ([127.0.0.1]:51952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9ZRQ-0008CF-1Y for submit@debbugs.gnu.org; Tue, 21 May 2024 20:02:48 -0400 Received: from anamika.lostca.se ([65.21.75.227]:43364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s9ZRL-0008C9-3Q for 70389@debbugs.gnu.org; Tue, 21 May 2024 20:02:46 -0400 Received: from localhost.localdomain (poincare.inet6.in [IPv6:2a0a:4cc0:1:12d4::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 0623FAD3A; Wed, 22 May 2024 00:01:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika; t=1716336120; 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=huxyI8UkNLWyuFH2UdroSJ8t0iGYbPyv3ANHEN+MltY=; b=Z98X5d02cYwYs7m1uA2F4rge760s7kJd1kEjC+rnYzxhTGgFxBrxuhX+bt3tY5/umituGI ZMWhegB39BJ4PagpPG9DdR8Gr0lEuyJJyZnnAUR6WXOqjRcnWKdEq+ERUnGHCuNfYxyE47 WMMy7XVp7m3XG6pnpA8IsimPnQo0XnM= Date: Tue, 21 May 2024 23:59:46 +0000 Message-ID: X-Mailer: git-send-email 2.45.1 In-Reply-To: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@lostca.se> References: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@lostca.se> 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: , Reply-to: ashish.is@lostca.se X-ACL-Warn: , "ashish.is--- via Guix-patches" From: "ashish.is--- via Guix-patches" via 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: -6.36 X-Spam-Score: -6.36 X-Migadu-Queue-Id: BA92361AAB X-Migadu-Scanner: mx13.migadu.com X-TUID: bSiluPyLosdu From: Ashish SHUKLA * gnu/packages/version-control.scm (fossil): Update to 2.24. [sources]: Switch to a simpler tarball URL. Add patches from upstream to fix unit-tests. [inputs]: Switch to sqlite-next as fossil needs bleeding edge sqlite. Change-Id: Id0cac2634282a0a141e2b17cb423c25e8aacee38 --- gnu/packages/version-control.scm | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c01eb9decd..d985c531d0 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3068,19 +3068,35 @@ (define-public git-annex-remote-rclone (license license:gpl3+))) (define-public fossil + (define (fossil-patch name from to hash) + (origin (method url-fetch) + (uri (string-append "https://fossil-scm.org/home/vpatch?from=" from + "&to=" to)) + (sha256 (base32 hash)) + (file-name name))) (package (name "fossil") - (version "2.20") + (version "2.24") (source (origin (method url-fetch) (uri (string-append - "https://www.fossil-scm.org/home/tarball/" - "210e89a0597f225f49722b096cf5563bf193e920e02a9bd38503a906deacd416" - "/fossil-src-" version ".tar.gz")) - ;; XXX: Currently the above hash must be manually updated. + "https://fossil-scm.org/home/tarball/version-" version "/fossil-" version ".tar.gz")) (sha256 - (base32 "08g7img88n2nwcdkpzmg4aqbp2iy40nllgas53502dspm97ym4h8")) + (base32 "0k1gjvxbvvs98yspnf7nj6rb0c7yf60savq7jywbkgimd0bkrkcm")) + (patch-flags '("-p0")) + (patches `(,(fossil-patch "fossil-disable-tests.patch" + "8be0372c10510437" + "5ad708085a90365f" + "1b4svsrz7cr1zi6qfpavj3ddm6dr0966jbgkbvgjz79ljqmpiasf") + ,(fossil-patch "fossil-fix-json-test.patch" + "fb4e90b662803e47" + "17c01c549e73c6b8" + "12gjzyxs22g9grv7qbgp9jg133bgcsj74621s05fk82j3fc7z59g") + ,(fossil-patch "fossil-comment-utf-tests.patch" + "5ad708085a90365f" + "fb4e90b662803e47" + "05h2mb6g0840yq74x1cdj95jmqb95i75h6g5v0rzqdc994b96cd4"))) (modules '((guix build utils))) (snippet '(delete-file-recursively "compat")))) @@ -3090,7 +3106,7 @@ (define-public fossil which ;for tests only ed)) ;ditto (inputs - (list openssl zlib sqlite)) + (list openssl zlib sqlite-next)) (arguments `(#:configure-flags (list "--with-openssl=auto" "--disable-internal-sqlite") base-commit: 413ef75f89ac337f7ac3331a862c7c8cdc88aa64 -- 2.45.1