Ashish SHUKLA <ashish.is@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 70389) by debbugs.gnu.org; 22 May 2024 00:02:49 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue May 21 20:02:48 2024
Received: from localhost ([127.0.0.1]:51952 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1s9ZRQ-0008CF-1Y
for submit <at> 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 <ashish.is@HIDDEN>) id 1s9ZRL-0008C9-3Q
for 70389 <at> 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=
From: ashish.is@HIDDEN
To: 70389 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: fossil: Update to 2.24.
Date: Tue, 21 May 2024 23:59:46 +0000
Message-ID: <b96ed1d29cfc8601ccd8ead081ff931b11f52eb3.1716335986.git.ashish.is@HIDDEN>
X-Mailer: git-send-email 2.45.1
In-Reply-To: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@HIDDEN>
References: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 70389
Cc: Ashish SHUKLA <ashish.is@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
From: Ashish SHUKLA <ashish.is@HIDDEN>
* 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
guix-patches@HIDDEN:bug#70389; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 14 Apr 2024 23:55:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Apr 14 19:55:53 2024
Received: from localhost ([127.0.0.1]:36387 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1rw9hP-00016Z-7l
for submit <at> debbugs.gnu.org; Sun, 14 Apr 2024 19:55:52 -0400
Received: from lists.gnu.org ([2001:470:142::17]:35816)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ashish.is@HIDDEN>) id 1rw9hM-00014y-SO
for submit <at> debbugs.gnu.org; Sun, 14 Apr 2024 19:55:49 -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 <ashish.is@HIDDEN>)
id 1rw9h4-0001y2-9p
for guix-patches@HIDDEN; Sun, 14 Apr 2024 19:55:30 -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 <ashish.is@HIDDEN>)
id 1rw9h2-0003pu-8A
for guix-patches@HIDDEN; Sun, 14 Apr 2024 19:55:30 -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 391595B6;
Sun, 14 Apr 2024 23:55:15 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lostca.se; s=anamika;
t=1713138915;
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=zEAEkIIwWAezGp9QfQPEfjF2NDUKmLwJMIzX2ZQ5Sok=;
b=gaguzlSQhhqHIQHz4dGNiBsxs7lrWJSU9WgTb+DkWRlF9tDbUkY3b+2lbwuijzIPg7wea1
eWQq91aO8j5soecSq55pEJHpttZMT2DB1ZzXXDPuA3JwiXRMtwnSGgjGpL2X2H1xyzCqhM
AK3cGjI97I2bfTlZhdiw/kV/c4bp54Y=
From: ashish.is@HIDDEN
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: fossil: update to 2.23
Date: Sun, 14 Apr 2024 23:54:50 +0000
Message-ID: <12bbabebdc8c229f8a000858cfb96495a7259d61.1713138890.git.ashish.is@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=65.21.75.227; envelope-from=ashish.is@HIDDEN;
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, 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-Debbugs-Envelope-To: submit
Cc: Ashish SHUKLA <ashish.is@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)
From: Ashish SHUKLA <ashish.is@HIDDEN>
* gnu/packages/version-control.scm (fossil): Update to 2.23.
Signed-off-by: Ashish SHUKLA <ashish.is@HIDDEN>
Change-Id: I1794e75cedc4a9bd878850e25686674cecd360e0
---
gnu/packages/version-control.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 19f128d45f..923f67a6a4 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -3015,17 +3015,17 @@ (define-public git-annex-remote-rclone
(define-public fossil
(package
(name "fossil")
- (version "2.20")
+ (version "2.23")
(source
(origin
(method url-fetch)
(uri (string-append
"https://www.fossil-scm.org/home/tarball/"
- "210e89a0597f225f49722b096cf5563bf193e920e02a9bd38503a906deacd416"
+ "47362306a7dd7c6fc3cab77cebe5d25469b0a9448479d9718eb5c49c8337b29"
"/fossil-src-" version ".tar.gz"))
;; XXX: Currently the above hash must be manually updated.
(sha256
- (base32 "08g7img88n2nwcdkpzmg4aqbp2iy40nllgas53502dspm97ym4h8"))
+ (base32 "1r1kabvmlhc0qgyq8g9zhq8i0123x9dba9b71j4xc71k14kfqjm9"))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "compat"))))
@@ -3035,7 +3035,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: 4e7337536ba41e888a601c92fada8a4adca9d2c6
--
2.41.0
ashish.is@HIDDEN:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#70389; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.