X-Loop: help-debbugs@HIDDEN
Subject: [bug#76728] [PATCH] gnu: avogadro2: fix open babel input
Resent-From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 04 Mar 2025 00:48:02 +0000
Resent-Message-ID: <handler.76728.B.17410492783395 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 76728
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76728 <at> debbugs.gnu.org
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.17410492783395
(code B ref -1); Tue, 04 Mar 2025 00:48:02 +0000
Received: (at submit) by debbugs.gnu.org; 4 Mar 2025 00:47:58 +0000
Received: from localhost ([127.0.0.1]:53162 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tpGRx-0000sg-LB
for submit <at> debbugs.gnu.org; Mon, 03 Mar 2025 19:47:57 -0500
Received: from lists.gnu.org ([2001:470:142::17]:39926)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <jakob.kirsch@HIDDEN>)
id 1tpGRu-0000sC-Bc
for submit <at> debbugs.gnu.org; Mon, 03 Mar 2025 19:47:55 -0500
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 <jakob.kirsch@HIDDEN>)
id 1tpGRk-0005fN-Mh
for guix-patches@HIDDEN; Mon, 03 Mar 2025 19:47:44 -0500
Received: from mout.web.de ([212.227.15.14])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <jakob.kirsch@HIDDEN>)
id 1tpGRf-0001BL-77
for guix-patches@HIDDEN; Mon, 03 Mar 2025 19:47:44 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de;
s=s29768273; t=1741049238; x=1741654038; i=jakob.kirsch@HIDDEN;
bh=jvLMwQif00B4bH/OPKF+x3xaMNdWDbGMcNlMat6j/o0=;
h=X-UI-Sender-Class:Date:From:To:Subject:Message-ID:MIME-Version:
Content-Type:cc:content-transfer-encoding:content-type:date:from:
message-id:mime-version:reply-to:subject:to;
b=Ovz3ZKj9awC//ZAVuMvCIhU+yjZalkmSNfy+voqFnZ+sUnTDyYRWvZpeXXXsspM+
IMaJ6AG04zwbQFKuEnd2y6HI54IBV6U03el4NRtGmlKBo51g7rna7sNRBatPZARQ3
FSSYyYX1TLfiDuMdJPlGxcBtpbee8bR/PF46Jotgy8rCuZ/sGxtMhIPrjn7oqfo9W
xsADtvnmBWh27YBzUkZ64KZAx6ymLDsOJK7jTuFqXpP/J7s8nXfT3ptFSnLVVFbA+
JFlHcdyy0WUs+Q9tRDXUfbtt2Ty9c2tXU77XAChhhvACupEWyhtLgqB8C1n03MvJC
FNkB0fvE+JiKGrmszQ==
X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6
Received: from kernelpanicroom ([134.19.29.228]) by smtp.web.de (mrweb005
[213.165.67.108]) with ESMTPSA (Nemesis) id 1N2SPD-1t8BPm2kgR-017WiT for
<guix-patches@HIDDEN>; Tue, 04 Mar 2025 01:47:18 +0100
Date: Tue, 4 Mar 2025 01:47:17 +0100
From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Message-ID: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="CvqVe5i5AIjPvPUz"
Content-Disposition: inline
X-Provags-ID: V03:K1:1dhnA4g3PyGbsfS2aZki9Pjn04r48f4MzAMZEVC9QhfyDCPIGaZ
Zv83RSerD0Wk/MVxeR+tn8V64tR5jGGbiwXXrxlpo/L6XWKEGpqAdZeYN3O/w00RvIogaah
Ga00q6kFbo6GL0MDKFfih5iRZyfdOe1Acl5csrEHa4C1sxiph1avHzjLr294h6Hym86z6V3
WwqEsTmhZbJTGB/+zWEgA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:EAnTLS+/5AA=;TnPNNo84fVUQPhnpZeXypcrhRio
Hz3k2B0+RbC/9x/NADrdQLcHetKTgHe3WP4+tiDXobjdLD45Ec95+L1grQ55wp/OZUX6Ftgfe
gMGxuAszWAmtcRuAzsc0ZpGs2//jBrDwkmKYG46Bryj3EJBRTMXEFFjdiPYmryqNlDQPauy/t
i5OeAxbBW4E3gCA4X9SwDyt17pQL6NqqftPIdEkUZIjN8kDDgIVjA3XJBnWNYqJ858jRvOf9z
bCW9cqGdryr/jZ6ELslcrAu/15F/KlKRtZPSgmL7pVOddJlRZQDvd143WAo75tICCa2LJeIJ1
BmEFkZ+7ECp8MEowupTExCwRCyQqIH3tS0Ic9hYRD+OIkNkqg9STBwpCosVHz81T+uq+uIfpg
oHWm3xXR/CBjAlSwMxL0eenTwFpeH/EXYH3g96oEwGmhzT9Al+U1OLh2SKa3Dg/JCn4DSqxHe
Q5/xSyt1VaQMsOhSu229TDV7/S2kXdZ7r6CLk09ckh3l6AulBhD0KaJpXvxR7Yax9iu8o+9jc
tg5zOYhYeIKobeIAWDBxIdSDH6w0nbkSyadHPGfd6WOvPw4PjsamgyMJLM2g7b7m01rHC5ntu
7TdzlRq58LXl6hOx5bIUwyG2uO3YZ3EZeQ1GD2hyCXoNcNFSFqVpxeYEqgyXUZYl7ISWX+wXR
6eyMNOZ2DEb8ejiHAjN+nzWotU6wvLpxlGTInPdUBme74OZVwNwE9oqSBgvLniIZBCGjKyBWC
Np+qwKFAJHubkwk97Sf7IsgA3u6yFRUpDt5sEQ7ogULf1lTMZbLMKVy7lZTSXzgKAurjE6x68
tyJYaWJa5zSNt2MqoIkbnobmE+nqMVsoTMCHNg8MKx1ao0Vn0Fc0YVmZD72UKjsWBYIplTBlL
02UTsYmaRwQ4TEKSobZ31JObjf4dgG6okF58BDD/wiVS5lFO2TI08BXSAGarshOiqwsT5ttKk
968Ts3EW+sE2nuc91hNwB+SemX1sZLXPr7onTQJPS1bHRSsPLrDSJRuQAPTOin8Bp3wwhLAXB
+18KSDIDfeY/Dw5rhl1HdNjBRzE1skCwJMckxX4FbQuS0MOtfSALpdEsFooJ3tYRHtbol5kTQ
Sr4xoSidycfZlqhTNUDHWdhlmWVjnuAoxoFQa3HPfL+H1mp1i9SLoCdhiA2A44Ti1wtmDIKpe
FfZYaAA8Ze6byo3G/qFZfQZ3ofaLNiua70ib4HpykbDEdRdF5V/nv4l4eNaqmnqu9V/YYWiDq
xMMAhLEuH9fjo243TpiV6UcFxSlRS88uQuoycyFLEI0na1zXpS8gJHcXQ4vNLGgldhOj+/Dwa
A3Ybu6Ij9ngrwfLe/dl/YpQxSWWCjz5L9d+G5L9TBpeILPE6zIAKWkeMVoy/Hbt3ziECQL24y
Ji6nlr8+L0QjnnqmcfweO9rv8/ff1z/98aITg2LutYZ8LiBCvN32yXeyTq
Received-SPF: pass client-ip=212.227.15.14; envelope-from=jakob.kirsch@HIDDEN;
helo=mout.web.de
X-Spam_score_int: -37
X-Spam_score: -3.8
X-Spam_bar: ---
X-Spam_report: (-3.8 / 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, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01,
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
SPF_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.0 (/)
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 (-)
--CvqVe5i5AIjPvPUz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
avogadro2 needs open babel at runtime so we should add this to the propagated inputs.
--CvqVe5i5AIjPvPUz
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
filename="v1-0001-gnu-avogadro2-Update-to-1.93.0.patch"
Content-Transfer-Encoding: quoted-printable
=46rom b353ae32e3b160b47ae1b34fe65e79b141caf05f Mon Sep 17 00:00:00 2001
Message-ID: <b353ae32e3b160b47ae1b34fe65e79b141caf05f.1741049088.git.jakob=
.kirsch@HIDDEN>
From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Date: Tue, 4 Mar 2025 01:44:43 +0100
Subject: [PATCH v1] gnu: avogadro2: Update to 1.93.0.
* gnu/packages/chemistry.scm (avogadro2): Update to 1.93.0.
[propagated-inputs]: Add openbabel.
Change-Id: Ia7f02e66d9caced61a6a206076513806bb7b29a9
=2D--
gnu/packages/chemistry.scm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index bd27bfad7a..46728bb407 100644
=2D-- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -130,6 +130,8 @@ (define-public avogadro2
(list eigen pkg-config))
(inputs
(list avogadrolibs hdf5 molequeue qtbase-5))
+ (propagated-inputs
+ (list openbabel))
;; TODO: Enable tests with "-DENABLE_TESTING" configure flag.
(arguments
'(#:tests? #f))
base-commit: 72923a75af53a819f2be9dc4ae3c096aa3147d3f
=2D-
2.48.1
--CvqVe5i5AIjPvPUz--
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Jakob Kirsch <jakob.kirsch@HIDDEN> Subject: bug#76728: Acknowledgement ([PATCH] gnu: avogadro2: fix open babel input) Message-ID: <handler.76728.B.17410492783395.ack <at> debbugs.gnu.org> References: <Z8ZNlSc-d6XXvY6_@kernelpanicroom> X-Gnu-PR-Message: ack 76728 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 76728 <at> debbugs.gnu.org Date: Tue, 04 Mar 2025 00:48:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 76728 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 76728: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D76728 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76728] [PATCH] gnu: avogadro2: fix open babel input
Resent-From: Z572 <z572@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 04 Mar 2025 03:19:02 +0000
Resent-Message-ID: <handler.76728.B76728.174105833519668 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76728
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76728 <at> debbugs.gnu.org
Cc: jakob.kirsch@HIDDEN
X-Debbugs-Original-To: Jakob Kirsch via Guix-patches via <guix-patches@HIDDEN>
X-Debbugs-Original-Cc: Jakob Kirsch <jakob.kirsch@HIDDEN>, 76728 <at> debbugs.gnu.org
Received: via spool by 76728-submit <at> debbugs.gnu.org id=B76728.174105833519668
(code B ref 76728); Tue, 04 Mar 2025 03:19:02 +0000
Received: (at 76728) by debbugs.gnu.org; 4 Mar 2025 03:18:55 +0000
Received: from localhost ([127.0.0.1]:53839 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tpIo2-000579-SF
for submit <at> debbugs.gnu.org; Mon, 03 Mar 2025 22:18:55 -0500
Received: from mail.z572.online ([88.99.160.180]:40994)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <z572@HIDDEN>) id 1tpInz-00056x-Vc
for 76728 <at> debbugs.gnu.org; Mon, 03 Mar 2025 22:18:53 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me;
t=1741058668;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=pkwJz4t/dJ9dJHJMTs9YvQ4K43icGZ1oQCKZQUKWzkU=;
b=p2+GdjZrgwh8McOACH9pBsu2cgKf16bbAAQCS+yFzOODwDBlICx5PcIe4Qwi15BqzoDL+c
aCiyyuODXUKtmgHEfiaAxFUeO6FCfQGY065xTI96F3XBy0VU+1hwipnGnWJRmvPSzOdLHu
hGD+RqvrLyjfSlH2Cubt0S2+zxlkeB4=
Received: from m (mail1.85362086.com [107.174.64.25])
by mail.z572.online (OpenSMTPD) with ESMTPSA id 65867ca5
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO);
Tue, 4 Mar 2025 03:24:27 +0000 (UTC)
From: Z572 <z572@HIDDEN>
In-Reply-To: <Z8ZNlSc-d6XXvY6_@kernelpanicroom> (Jakob Kirsch via Guix-patches
via's message of "Tue, 4 Mar 2025 01:47:17 +0100")
References: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
User-Agent: mu4e 1.12.7; emacs 30.0.92
Date: Tue, 04 Mar 2025 11:18:34 +0800
Message-ID: <87wmd5jxf9.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: 2.0 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Jakob Kirsch via Guix-patches via <guix-patches@HIDDEN>
writes:
> avogadro2 needs open babel at runtime so we should add this to the
propagated
inputs. > > [2. text/plain; v1-0001-gnu-avogadro2-Update-to-1.93.0.patch]...
Content analysis details: (2.0 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[88.99.160.180 listed in sa-trusted.bondedsender.org]
-0.0 SPF_PASS SPF: sender matches SPF record
2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs
[URI: z572.online (online)]
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[88.99.160.180 listed in bl.score.senderscore.com]
0.0 FROM_SUSPICIOUS_NTLD From abused NTLD
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: 2.0 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Jakob Kirsch via Guix-patches via <guix-patches@HIDDEN> writes:
> avogadro2 needs open babel at runtime so we should add this to the propagated
inputs. > > [2. text/plain; v1-0001-gnu-avogadro2-Update-to-1.93.0.patch]...
Content analysis details: (2.0 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[88.99.160.180 listed in bl.score.senderscore.com]
0.0 RCVD_IN_VALIDITY_SAFE_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[88.99.160.180 listed in sa-accredit.habeas.com]
-0.0 SPF_PASS SPF: sender matches SPF record
2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs
[URI: z572.online (online)]
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.0 FROM_SUSPICIOUS_NTLD From abused NTLD
1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
--=-=-=
Content-Type: text/plain
Jakob Kirsch via Guix-patches via <guix-patches@HIDDEN> writes:
> avogadro2 needs open babel at runtime so we should add this to the propagated inputs.
>
> [2. text/plain; v1-0001-gnu-avogadro2-Update-to-1.93.0.patch]...
I think wrapper might be better, if it's just an application.
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmfGcQoACgkQO1qpk+Gi
3/DgWQ/9F9LG/GzBAUAem54hKcG67foMG3d/Npmejh7Lf5Bv/5FC/98mrOeatxjC
FfbShhMx5zZ4SVwX0lCKc6ff1kjEFffsd+jfFZmHgsgB/BVarf9gv0W5zQaFjvwg
VMmot4jtDf68fGFVT/kOXh+JfEWL0SCKREeUChAskik01y1rrNGQ2rI5gvyzMfBq
rSXF9a/YKMuG0SiDmhriADQC1NMKyX8kzKDUpWIjMq88dRSOr16k6ObMqZqAt7rP
nns+3GZ+ewtNzJjLA0613cftl+X77DCyq0QpPoDmqcuP/krRetgkncL1j5kizP5A
yDiBWWdRW1Ah1YN5GhOYda27m29RI56LBFFOvmfR06HVa6qVbLE2+RtpXniLOTPK
0A/M626MQyB8Dr6IUVhCNIGAKrWrPeXA4XUVQCBG2yR7vcPTdAuy3Ef5GnGcWiW9
3DMjcreQpmZUo+kWg2AVSjoK14awRTv1viUh8Alf2cPCSoOjcK2Ur6Da9bJqulc9
wHXqohqbN88VEIunVU+vR/nmQIFiccevXn8J6Ov8Q95ofFH/f37Egr/59kVB4CzH
cjX8/rk8o4XYgTD5iHmmPIXXe+OM98uSe4yJZN5qVvFNvU25ea+l0eZaZVdq/zVh
zogqImwIWrWbIEp9MoZf+FrSXYz+3q/JvpkU/T/1YekSive4yvM=
=Keha
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76728] [PATCH] gnu: avogadro2: fix open babel input
Resent-From: Z572 <z572@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 04 Mar 2025 03:20:01 +0000
Resent-Message-ID: <handler.76728.B.174105834519721 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76728
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76728 <at> debbugs.gnu.org
Cc: jakob.kirsch@HIDDEN
X-Debbugs-Original-To: Jakob Kirsch via Guix-patches via <guix-patches@HIDDEN>
X-Debbugs-Original-Cc: Jakob Kirsch <jakob.kirsch@HIDDEN>, 76728 <at> debbugs.gnu.org
Received: via spool by submit <at> debbugs.gnu.org id=B.174105834519721
(code B ref -1); Tue, 04 Mar 2025 03:20:01 +0000
Received: (at submit) by debbugs.gnu.org; 4 Mar 2025 03:19:05 +0000
Received: from localhost ([127.0.0.1]:53843 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tpIoC-000581-9f
for submit <at> debbugs.gnu.org; Mon, 03 Mar 2025 22:19:04 -0500
Received: from lists.gnu.org ([2001:470:142::17]:50102)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <z572@HIDDEN>) id 1tpIo9-00057H-5h
for submit <at> debbugs.gnu.org; Mon, 03 Mar 2025 22:19:01 -0500
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 <z572@HIDDEN>) id 1tpIo3-0006ej-F6
for guix-patches@HIDDEN; Mon, 03 Mar 2025 22:18:55 -0500
Received: from mail.z572.online ([88.99.160.180])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <z572@HIDDEN>) id 1tpIo1-0007Kc-Of
for guix-patches@HIDDEN; Mon, 03 Mar 2025 22:18:55 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=z572.online; s=me;
t=1741058668;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=pkwJz4t/dJ9dJHJMTs9YvQ4K43icGZ1oQCKZQUKWzkU=;
b=p2+GdjZrgwh8McOACH9pBsu2cgKf16bbAAQCS+yFzOODwDBlICx5PcIe4Qwi15BqzoDL+c
aCiyyuODXUKtmgHEfiaAxFUeO6FCfQGY065xTI96F3XBy0VU+1hwipnGnWJRmvPSzOdLHu
hGD+RqvrLyjfSlH2Cubt0S2+zxlkeB4=
Received: from m (mail1.85362086.com [107.174.64.25])
by mail.z572.online (OpenSMTPD) with ESMTPSA id 65867ca5
(TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO);
Tue, 4 Mar 2025 03:24:27 +0000 (UTC)
From: Z572 <z572@HIDDEN>
In-Reply-To: <Z8ZNlSc-d6XXvY6_@kernelpanicroom> (Jakob Kirsch via Guix-patches
via's message of "Tue, 4 Mar 2025 01:47:17 +0100")
References: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
User-Agent: mu4e 1.12.7; emacs 30.0.92
Date: Tue, 04 Mar 2025 11:18:34 +0800
Message-ID: <87wmd5jxf9.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
micalg=pgp-sha512; protocol="application/pgp-signature"
Received-SPF: pass client-ip=88.99.160.180; envelope-from=z572@HIDDEN;
helo=mail.z572.online
X-Spam_score_int: 0
X-Spam_score: -0.1
X-Spam_bar: /
X-Spam_report: (-0.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,
FROM_SUSPICIOUS_NTLD=0.001, PDS_OTHER_BAD_TLD=1.985,
RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 3.0 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Jakob Kirsch via Guix-patches via <guix-patches@HIDDEN>
writes:
> avogadro2 needs open babel at runtime so we should add this to the
propagated
inputs. > > [2. text/plain; v1-0001-gnu-avogadro2-Update-to-1.93.0.patch]...
Content analysis details: (3.0 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [2001:470:142:0:0:0:0:17 listed in] [list.dnswl.org]
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs
[URI: z572.online (online)]
1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail)
0.0 FROM_SUSPICIOUS_NTLD From abused NTLD
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: 3.0 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Jakob Kirsch via Guix-patches via <guix-patches@HIDDEN> writes:
> avogadro2 needs open babel at runtime so we should add this to the propagated
inputs. > > [2. text/plain; v1-0001-gnu-avogadro2-Update-to-1.93.0.patch]...
Content analysis details: (3.0 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust
[2001:470:142:0:0:0:0:17 listed in]
[list.dnswl.org]
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs
[URI: z572.online (online)]
1.0 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail)
0.0 FROM_SUSPICIOUS_NTLD From abused NTLD
1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
--=-=-=
Content-Type: text/plain
Jakob Kirsch via Guix-patches via <guix-patches@HIDDEN> writes:
> avogadro2 needs open babel at runtime so we should add this to the propagated inputs.
>
> [2. text/plain; v1-0001-gnu-avogadro2-Update-to-1.93.0.patch]...
I think wrapper might be better, if it's just an application.
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEfr6klGDOXiwIdX/bO1qpk+Gi3/AFAmfGcQoACgkQO1qpk+Gi
3/DgWQ/9F9LG/GzBAUAem54hKcG67foMG3d/Npmejh7Lf5Bv/5FC/98mrOeatxjC
FfbShhMx5zZ4SVwX0lCKc6ff1kjEFffsd+jfFZmHgsgB/BVarf9gv0W5zQaFjvwg
VMmot4jtDf68fGFVT/kOXh+JfEWL0SCKREeUChAskik01y1rrNGQ2rI5gvyzMfBq
rSXF9a/YKMuG0SiDmhriADQC1NMKyX8kzKDUpWIjMq88dRSOr16k6ObMqZqAt7rP
nns+3GZ+ewtNzJjLA0613cftl+X77DCyq0QpPoDmqcuP/krRetgkncL1j5kizP5A
yDiBWWdRW1Ah1YN5GhOYda27m29RI56LBFFOvmfR06HVa6qVbLE2+RtpXniLOTPK
0A/M626MQyB8Dr6IUVhCNIGAKrWrPeXA4XUVQCBG2yR7vcPTdAuy3Ef5GnGcWiW9
3DMjcreQpmZUo+kWg2AVSjoK14awRTv1viUh8Alf2cPCSoOjcK2Ur6Da9bJqulc9
wHXqohqbN88VEIunVU+vR/nmQIFiccevXn8J6Ov8Q95ofFH/f37Egr/59kVB4CzH
cjX8/rk8o4XYgTD5iHmmPIXXe+OM98uSe4yJZN5qVvFNvU25ea+l0eZaZVdq/zVh
zogqImwIWrWbIEp9MoZf+FrSXYz+3q/JvpkU/T/1YekSive4yvM=
=Keha
-----END PGP SIGNATURE-----
--=-=-=--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76728] [PATCH] v2
References: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
In-Reply-To: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
Resent-From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 04 Mar 2025 19:17:02 +0000
Resent-Message-ID: <handler.76728.B76728.174111579832114 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76728
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76728 <at> debbugs.gnu.org
Received: via spool by 76728-submit <at> debbugs.gnu.org id=B76728.174111579832114
(code B ref 76728); Tue, 04 Mar 2025 19:17:02 +0000
Received: (at 76728) by debbugs.gnu.org; 4 Mar 2025 19:16:38 +0000
Received: from localhost ([127.0.0.1]:32916 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tpXks-0008Lt-0X
for submit <at> debbugs.gnu.org; Tue, 04 Mar 2025 14:16:38 -0500
Received: from mout.web.de ([212.227.15.4]:34117)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <jakob.kirsch@HIDDEN>)
id 1tpXko-0008LO-J7
for 76728 <at> debbugs.gnu.org; Tue, 04 Mar 2025 14:16:35 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de;
s=s29768273; t=1741115785; x=1741720585; i=jakob.kirsch@HIDDEN;
bh=PPWQrAXM+9FFvRD8d7K1T/tfF99kadS58n1k7G7FNxo=;
h=X-UI-Sender-Class:Date:From:To:Subject:Message-ID:MIME-Version:
Content-Type:cc:content-transfer-encoding:content-type:date:from:
message-id:mime-version:reply-to:subject:to;
b=eiBP8rR2wLR7A5CKkowJaoKlR3AvVCrEj5FkMieMvpg9oCDRlpms5Ha1z5wMZcXT
4015LAp365fCosC3mp3ibtWljg7iZZnRnCzDBb0YpwOboxq7JbPaLFmxjst2qbo9z
3h7WZdIw+O1L9k+opv/jhSczrL1Z/PtVx/9dJnTwF7yjnrnUu670D7C03YARyBDHc
3CvgcDFNCrLkwUE7EbR3KghhQ3Dszvtgp1QVy22OiTzfrxKx32dZLHbRISODnBwuv
rNFd/6n5PpvITdWA9io5nAQW/X8WA+V7hepN5wfRHE80pJ8brIhPoiA/+r0uGX0Tt
UgBlrgL344cxmKPhFw==
X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6
Received: from kernelpanicroom ([134.19.29.228]) by smtp.web.de (mrweb006
[213.165.67.108]) with ESMTPSA (Nemesis) id 1MIyeU-1tZXKl1ptq-00RxGZ for
<76728 <at> debbugs.gnu.org>; Tue, 04 Mar 2025 20:16:25 +0100
Date: Tue, 4 Mar 2025 20:16:26 +0100
From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Message-ID: <Z8dRinHG_7y54YUj@kernelpanicroom>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Iyl16qkj3h7qFc1d"
Content-Disposition: inline
X-Provags-ID: V03:K1:20/Jg5GFaBgENqDkyBhCCV7ToThWvaNCJweAjOK+98xSvzHiYeh
9ew00FO5lYXfBXbplLvXh/6NKIcW8jfICVaWUALS5VNYaWISlfM7o7IbyUpsnjlRYTpJ8RC
AicA8tY61DOzzW0tpscMbBfK+J6Fwka6v4IBJrlA8MbTMSPwmyQmJTjjUBNbVouO49geZXP
7l6l3ditQaBXNU+4+u9Gw==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:Rq3bEpKA4Fo=;EP5IMyFJA7/CODJ3GTuwM1fkXME
uNnuI0GpgjwmTlI05hZBWa1pU6lqspFaHf2w6bVL7Ntn8dxslqEsHNgphBjWDTDkgMGRxSHqS
A71W4C5eJ+X6Ic7bxOdGtHLIcWkGfL5C5/smEmo384C9yIVH5TnjZvErQ0F42D3hk0D6Pn7Tk
/Ur4WQi7mnPxYrW52qXCF9+Mb0uC/hWOs1M1WpQoI3hi3K6lcc7gFiO57XMunQ4i3hAfljTRY
+p027tr1WhRTdWoAx1l3RpYRfZCWeEPW9QXXc6Upe0vhBaLb1F6lHKH1AeNmglG+3BrDfl3qf
pMOG4w5dxKbBs5IuO1VtUu1lN1n+DrAEw5qg/7LBggV2OEpMWdZRwje/CMk/G1RgruU3VX/J1
5/fIU+WInz/cM1rzpf6+BT8tn30j/lPLCJjpbZ0d6ljGLFjZ6B+5OUzhKZoWqYZs1+f3HRP0b
yDotV8rbp640Ss8mMBHwpw/gtlF6zsk2h6M3Pd4HeFXVRucgLWd1F8nVFPo+lb/2sfX4Da2fT
j4onrALG7nM1nrHFXW6UlMp/nR7vKsj22DMrr0zjugkBmDXdnO+LPpKIH6+wUmyg6z120deis
GLzHg/p5HiWprG0UVvoKS0swiGi1FoBqswekhP/R0L0BnvEHchYQkYXdAKEYef8cYbpybRKwi
lrLNAW/ijYKdcF23tACiqF+xHyCuSESaTDxCBUoTqNDKnr1qA255v1gcjK8DwL6onmP/tlL5m
ilW4QlCgj36AOYRNkTHLtDpu7m+xJyI+G1zsAs2qmxth1GRG8oZkYX2E+oiAOyck9sXuDqXdI
nwXWeB8c5xxwuzaVFAg4dSBa9Z7Hnpv1fIf8EjQaTg1VTGrOTS3P85Y3xR8+MZY/3AD5u4QUo
79q5vnNuR4d0AqqWg1kuulMr0AIIAjaZEanZqbRS+SfXIJFW2pi9dZPDqum0oZcoOWzXj0rYy
ISGiMPq6ejv9KGcS3IE6PgF4FRFN4wfD8CxwwU53CHpxVAYksbRC898atrY5gQdc2mbhbKQMJ
934GoRZ6SXpmrCe6TA9RXsdY+BErutpdSIX1swvXJSHd8U4kNpy5FzSYPOhAAX1Kq+HiBSPcE
Qx0L29OYYLO/I83p7u1wYYEtTyoBR0Rvw1qGk+7Mrzu2XGtTiyhYksb0ucIlJ63qNO68y/iMZ
IC0AS4QyiNMkxsPW09reViV6TKuitxr1Ll0Y1lXFyKMBrX05UezDjIZX1BbMtKoKa7nY6+jov
KOtDhiev1bzK/YX/cQi8tfRBRvOWLmN6AHEqM7XMXyVwtUJaKzRvBfcn35YX5gHZZoaJBmahd
sOaQ6W8cxat2lxTXmK3ezaSlyHuK10AccT5I1PeMW+rOsEcEOrH0C38lVpI7lQzOIsAs8mFkO
Ks0Mz9ruErbNow+nbgZEjH/RvB+kFD30A64+gNVyD+82ZZknrcypMD/RmnH8KXa6MNnOBqnkp
OPvvYLr+R2a9EWxyQnwpB/wkuyBo=
X-Spam-Score: -0.7 (/)
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.7 (-)
--Iyl16qkj3h7qFc1d
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
This is the v2 with wrap-program instead of propagated-inputs.
--Iyl16qkj3h7qFc1d
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment;
filename="v2-0001-gnu-avogadro2-Update-to-1.93.0.patch"
Content-Transfer-Encoding: quoted-printable
=46rom 5608c37f14b7b5d46f6ac0a31b4f0c073bd186aa Mon Sep 17 00:00:00 2001
Message-ID: <5608c37f14b7b5d46f6ac0a31b4f0c073bd186aa.1741115763.git.jakob=
.kirsch@HIDDEN>
From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Date: Tue, 4 Mar 2025 20:15:05 +0100
Subject: [PATCH v2] gnu: avogadro2: Update to 1.93.0.
* gnu/packages/chemistry.scm (avogadro2): Update to 1.93.0.
Change-Id: Ic133ed59aac11d9f48443c1d297d69060514d01f
=2D--
gnu/packages/chemistry.scm | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index bd27bfad7a..78fedfd34f 100644
=2D-- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -122,17 +122,23 @@ (define-public avogadro2
(url "https://github.com/OpenChemistry/avogadroapp")
(commit version)))
(sha256
- (base32
- "1z3pjlwja778a1dmvx9aqz2hlw5q9g3kqxhm9slz08452600jsv7"))
+ (base32 "1z3pjlwja778a1dmvx9aqz2hlw5q9g3kqxhm9slz08452600jsv7"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
- (native-inputs
- (list eigen pkg-config))
- (inputs
- (list avogadrolibs hdf5 molequeue qtbase-5))
+ (native-inputs (list eigen pkg-config))
+ (inputs (list avogadrolibs hdf5 molequeue qtbase-5))
;; TODO: Enable tests with "-DENABLE_TESTING" configure flag.
(arguments
- '(#:tests? #f))
+ (list
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'wrap-program
+ (lambda _
+ (wrap-program (string-append #$output "/bin/avogadro2")
+ (list "PATH"
+ 'suffix
+ (list (string-append #$openbabel "/bin")))))))))
(home-page "https://www.openchemistry.org/projects/avogadro2/")
(synopsis "Advanced molecule editor")
(description
base-commit: c1ec9e8d53da209ba1d6f8466d03180d195d7334
=2D-
2.48.1
--Iyl16qkj3h7qFc1d--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76728] New patch
References: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
In-Reply-To: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
Resent-From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 06 Mar 2025 14:54:02 +0000
Resent-Message-ID: <handler.76728.B76728.174127282027795 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76728
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76728 <at> debbugs.gnu.org
Received: via spool by 76728-submit <at> debbugs.gnu.org id=B76728.174127282027795
(code B ref 76728); Thu, 06 Mar 2025 14:54:02 +0000
Received: (at 76728) by debbugs.gnu.org; 6 Mar 2025 14:53:40 +0000
Received: from localhost ([127.0.0.1]:42144 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tqCbT-0007EE-Cp
for submit <at> debbugs.gnu.org; Thu, 06 Mar 2025 09:53:40 -0500
Received: from mout.web.de ([212.227.17.12]:53835)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <jakob.kirsch@HIDDEN>)
id 1tqCbP-0007Dv-1B
for 76728 <at> debbugs.gnu.org; Thu, 06 Mar 2025 09:53:37 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de;
s=s29768273; t=1741272808; x=1741877608; i=jakob.kirsch@HIDDEN;
bh=BnIjyWFUeJBOSsPtv85OiIAAw8ChzNJAolGRMUbX7hk=;
h=X-UI-Sender-Class:Date:From:To:Subject:Message-ID:MIME-Version:
Content-Type:cc:content-transfer-encoding:content-type:date:from:
message-id:mime-version:reply-to:subject:to;
b=D5srXLWU2z1mCgM3pSmgyrMErc5vhTSuebUvlk35z2NiR/oQH/l2mjkr2DOWS1bO
+DUuTjlTOd6trsJchLavirUWLjAen/z7iE+ToAvXAbcL1k7YpRbb+osBq49hQ0Lnh
r5uYHVQ7WF+1DE7/fi5Q9aLEojJdM8UBk07LMA8T06zM1NxuqIri7RIsFPGBUmFIp
I+4Tkv2udGb/NPqMNZU7fSB8GGnCJvFBUxHRnFYz1VGxS5NNY/ZgubxqsJKIxYYP3
flGsbcRPkpwMErKP/pWAS1EOHb4OeT44EkkKxzvHJYCzST8FiEzow/U6pdpKEwZ6D
Wo3t438G9w3q7HE+gQ==
X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6
Received: from kernelpanicroom ([134.19.29.228]) by smtp.web.de (mrweb106
[213.165.67.124]) with ESMTPSA (Nemesis) id 1N4NDQ-1t9kDe1cxC-00urFX for
<76728 <at> debbugs.gnu.org>; Thu, 06 Mar 2025 15:53:28 +0100
Date: Thu, 6 Mar 2025 15:53:25 +0100
From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Message-ID: <Z8m25VAAhrH0Q9wk@kernelpanicroom>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Jjo27NijAr/RneYV"
Content-Disposition: inline
X-Provags-ID: V03:K1:SAvT12QFRRYTE+h3H+fvxSZ/y1xxe1zCyfor+QiwMkLCn29N2Eq
b1FFRF0+h2L6bSVSHfWHanGxSCRd8/iR03QqHWMK8HyfPKDBdlcH8xV1am7NsMuGyYgHbW6
cUw3cBtb3uiFOMKFNzrzjJ3R407vSFVI7JbXswUIA6pX75sy2w7O8XUbf/axtoRsGiOmDls
EXzUbhI2oRkybyaMkIHrA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:jpLop3ZuXJY=;cwdOf9kt7BaHahqfwcBrr5BTnBq
7IhP2sZIMhL4zDb4Ek8Gjxu7wAREe9otLNZG/GIoU/+W7t68tovY3XyUHplHh8MpRa0urY6O2
VJLuBr6DaC0A59st0KVFKgHg48fo9AuDgBmyHxtqSub50rl7mZ/FWWsVDFZ98RSZUuHG33Vwq
ZXU48QqccvRnBXMYBMAEm27L05V2kmv9y58+u7jYE6xtlkFFRJCmAXOgRGCjbFWiscg+bUTrA
qIB/3n9oDSDUmlhsSfmZZmJ8PPIt6ykrauJSFWibC8ntnQ64tJSG2PSU5zIDkWQvV4VB7+8N+
FfjP4B/+AGTWqdEHvbbaLHPs/3AGMykMvudpfIh/wT3MJxsK6VAFu8TkVZ4AhjMhDx80tEkWe
sj3N7oAr8f7sgHhmf28OJviHL71vzBe7hnC/JdRVm2H4xQ/MVa8eRi6gV2avdRe82KAazmywf
WgqM1uewSAfQYfwyzUHymM2zsf7ItLeQQ8kYOrbhZUbbjzyKH+XYcwgxSJZAOKL6jBrF1PGIq
jlCqj0ouxra2m9HgfvubePRJ0jIcrb6raL+Q9/IVd/yKfhJK1BWu3BKkFyhkHuRMkS6tPpf25
UNDdG1MxlC+lf6OWq8jPIRHMEB0CNWbepSnd0RYPZDLT91QhssjmyOj+/p4pbM8NNuWBTLorw
n2JiTYR+LBkV7/A65MYBLDfrOdtUhkTV/hJw9KdOQwWUfp6E0qishJnha4Rf4KBYeXSZWlOhA
rL0wa2Ta9/o7dzMB95csbAMWsDoXTE1Dd1YWvIA71cLP2jeOlE4wG/c3XM2WDjZVuxevv5ymz
YzCQKu4EHj7qwVfaTAOPuxkhJO836u9UGPmHaetJ2ZvhlVj8vwzFhApBvg0qzCeHw6eTWSDV9
2wc0n5Y893dmws8h75mZ4wPMIDw0dv6aGHMjM+7qBF76Wn0tzZh/XeniT7PEVSyPoA5PM/Akg
0bUudjGxxlwNa4YUPzNYXyvtZ3lcAIZeUfa+epthvFK5GGYIGTGfq9JTpFZ5hBmFDR7Dmfrwe
fGfxNBKsV5hXGj2LvSboZQsOgz39ybdmpAjsmbINlX2qVnA7E0p0eGUiOvpAy15MRsWXdqL0x
OXys34SNbKdWZevHQohXnyDb9lVX6XtUx5b6FlBU1hn+/zzK153Co83ZKdT4dYFE3JSadwOg8
ixopSgnZuKU28vzo014jsRXExPaAKOVVMvZ16wmkfk5ACYI3CDS4jXjWMATimmuo01RJEdlNy
tP1Sl2sBakqxlK550TUfuUB90LLaKa8vNAqcqLA+5ceHtInla9dHB3i2G0ZNC4nDjZuHaE3pH
1CKZ6ht6XBXjEawB6T9yf//fl4o1hRKzWbnFmL50PJvSXUjO9vifx692FCZ8MAManebUioYXA
qq/yEusonXdqFMrwY3KZlSuGQ4LJu7wDyImx5QwTuvh2RcaYLpgi1fGR7f3cTcOcYLvwmyX1d
/tp/72YAQ1SgW7PuWjryAVrnQWzc=
X-Spam-Score: 0.0 (/)
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 (-)
--Jjo27NijAr/RneYV
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Since we're rebuilding avogadro2, we might as well update it to the new version.
Btw etc/committer.scm is broken with this patch so the merger would have to properly format the commits or fix the committer.
--Jjo27NijAr/RneYV
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment;
filename="v1-0001-Update-avogadro2-to-1.100.patch"
Content-Transfer-Encoding: quoted-printable
=46rom 8a4aec3970b8eb31410933b77cd92937dca81309 Mon Sep 17 00:00:00 2001
Message-ID: <8a4aec3970b8eb31410933b77cd92937dca81309.1741272703.git.jakob=
.kirsch@HIDDEN>
From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Date: Thu, 6 Mar 2025 15:51:33 +0100
Subject: [PATCH v1] Update avogadro2 to 1.100
Change-Id: Ia97823f9950a587b52b274b17338102cf4340e71
=2D--
gnu/packages/chemistry.scm | 217 +++++++++++++++++++++++++++++--------
1 file changed, 170 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index bd27bfad7a..af51fc4d55 100644
=2D-- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -7,6 +7,7 @@
;;; Copyright =A9 2020 Vincent Legoll <vincent.legoll@HIDDEN>
;;; Copyright =A9 2021 Ricardo Wurmus <rekado@HIDDEN>
;;; Copyright =A9 2022, 2023, 2024 David Elsing <david.elsing@HIDDEN>
+;;; Copyright =A9 2025 Jakob Kirsch <jakob.kirsch@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -67,13 +68,75 @@ (define-module (gnu packages chemistry)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python))
+(define-public avogadro-molecules
+ (package
+ (name "avogadro-molecules")
+ (version "1.100")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openchemistry/molecules")
+ (commit "8a37883")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "00mfx0bwmqazbiklrvaijjd5n4wa5lp3z73291ihm78q0v9dzhl4")))=
)
+ (build-system copy-build-system)
+ (home-page "https://two.avogadro.cc/")
+ (synopsis "Common molecule fragments for visualization in Avogadro")
+ (description
+ "Common molecule fragments including a variety of organic functional=
groups.")
+ (license license:bsd-3)))
+
+(define-public avogadro-crystals
+ (package
+ (name "avogadro-crystals")
+ (version "1.100")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openchemistry/crystals")
+ (commit "28404bd")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0kcz99q5nfl2v2qmm9cqnbb2c2qqzw79vsnv557i7x64bxsxrw1m")))=
)
+ (build-system copy-build-system)
+ (home-page "https://two.avogadro.cc/")
+ (synopsis
+ "Crystallographic files of common materials, elements, oxides, for v=
isualization in Avogadro")
+ (description
+ "Crystal structures of over 500 common materials, elements, oxides."=
)
+ (license license:bsd-3)))
+
+(define-public avogadro-fragments
+ (package
+ (name "avogadro-fragments")
+ (version "1.100")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openchemistry/fragments")
+ (commit "c4943b5")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "17l6qmkc25wb0nvic708l25fxiy89b3vfs0x5d40qcnn27bid32n")))=
)
+ (build-system copy-build-system)
+ (home-page "https://two.avogadro.cc/")
+ (synopsis "Molecular fragments for Avogadro")
+ (description
+ "Molecular fragments and inorganic ligands for rapidly building stru=
ctures")
+ (license license:bsd-3)))
+
(define-public avogadrolibs
(package
(name "avogadrolibs")
- (version "1.93.0")
+ (version "1.100.0")
(source
(origin
(method git-fetch)
@@ -81,28 +144,39 @@ (define-public avogadrolibs
(url "https://github.com/OpenChemistry/avogadrolibs")
(commit version)))
(sha256
- (base32 "1xivga626n5acnmwmym8svl0pdri8hkp59czf04ri2zflnviyh39"))
+ (base32 "1l9bp3ba8yx9mk2in5v375jzi1w4y7l1xl37xqv869810drgjffc"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
- (native-inputs
- (list eigen
- mmtf-cpp
- googletest
- pkg-config
- pybind11))
- (inputs
- (list glew
- libarchive
- libmsym
- molequeue
- python
- spglib
- qtbase-5))
+ (native-inputs (list eigen
+ mmtf-cpp
+ googletest
+ pkg-config
+ pybind11
+ avogadro-molecules
+ avogadro-crystals
+ avogadro-fragments))
+ (inputs (list glew
+ libarchive
+ libmsym
+ molequeue
+ python
+ spglib
+ qtbase-5
+ qtsvg-5))
(arguments
- '(#:configure-flags (list "-DENABLE_TESTING=3DON"
- (string-append "-DSPGLIB_INCLUDE_DIR=3D"
- (assoc-ref %build-inputs "s=
pglib")
- "/include"))))
+ (list
+ #:configure-flags
+ #~(list "-DENABLE_TESTING=3DON"
+ (string-append "-DSPGLIB_INCLUDE_DIR=3D"
+ (assoc-ref %build-inputs "spglib") "/include=
"))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'symlink
+ (lambda _
+ (begin
+ (symlink #$avogadro-molecules "../molecules")
+ (symlink #$avogadro-crystals "../crystals")
+ (symlink #$avogadro-fragments "../fragments")))))))
(home-page "https://www.openchemistry.org/projects/avogadro2/")
(synopsis "Libraries for chemistry, bioinformatics, and related areas=
")
(description
@@ -111,10 +185,30 @@ (define-public avogadrolibs
bioinformatics, materials science, and related areas.")
(license license:bsd-3)))
+(define-public avogadro-i18n
+ (package
+ (name "avogadro-i18n")
+ (version "1.100")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openchemistry/avogadro-i18n")
+ (commit "07bee85")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1vhjh0gilmm90269isrkvyzwwh1cj3bwcxls394psadw1a89mk14")))=
)
+ (build-system copy-build-system)
+ (home-page "https://two.avogadro.cc/")
+ (synopsis "Translations for Avogadro app and libraries")
+ (description
+ "Translations for the Avogadro app and libraries. Contributions and =
edits are always welcome through Weblate.")
+ (license license:bsd-3)))
+
(define-public avogadro2
(package
(name "avogadro2")
- (version "1.93.0")
+ (version "1.100.0")
(source
(origin
(method git-fetch)
@@ -122,17 +216,28 @@ (define-public avogadro2
(url "https://github.com/OpenChemistry/avogadroapp")
(commit version)))
(sha256
- (base32
- "1z3pjlwja778a1dmvx9aqz2hlw5q9g3kqxhm9slz08452600jsv7"))
+ (base32 "19cd5aqvcw6xj0x1kmzmxl0vrnbhk5ymnl9p2p4d9504ma5k6aim"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
- (native-inputs
- (list eigen pkg-config))
- (inputs
- (list avogadrolibs hdf5 molequeue qtbase-5))
+ (native-inputs (list eigen pkg-config avogadro-i18n))
+ (inputs (list avogadrolibs hdf5 molequeue qtbase-5))
;; TODO: Enable tests with "-DENABLE_TESTING" configure flag.
(arguments
- '(#:tests? #f))
+ (list
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'symlink
+ (lambda _
+ (begin
+ (symlink #$avogadro-i18n "../avogadro-i18n"))))
+
+ (add-after 'install 'wrap-program
+ (lambda _
+ (wrap-program (string-append #$output "/bin/avogadro2")
+ (list "PATH"
+ 'suffix
+ (list (string-append #$openbabel "/bin")))))))))
(home-page "https://www.openchemistry.org/projects/avogadro2/")
(synopsis "Advanced molecule editor")
(description
@@ -481,7 +586,7 @@ (define-public openbabel
(define-public spglib
(package
(name "spglib")
- (version "1.16.0")
+ (version "2.5.0")
(source
(origin
(method git-fetch)
@@ -489,26 +594,44 @@ (define-public spglib
(url "https://github.com/spglib/spglib")
(commit (string-append "v" version))))
(sha256
- (base32 "1kzc956m1pnazhz52vspqridlw72wd8x5l3dsilpdxl491aa2nws"))
- (file-name (git-file-name name version))))
+ (base32 "0x5igrqwx7r2shysmi9sqcjg4hpb7hba3ddlwg05z6c57a3ifbqc"))
+ (file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet #~(begin
+ (substitute* "CMakeLists.txt"
+ (("include\\(cmake/DynamicVersion.cmake\\)")
+ "")
+ (("dynamic_version.*")
+ "")
+ (("PROJECT_PREFIX.*")
+ "")
+ (("FALLBACK_VERSION.*")
+ "set (PROJECT_VERSION 2.5.0")
+ (("\\$\\{PROJECT_VERSION_FULL\\}")
+ "2.5.0")
+ (("\\$\\{GIT_COMMIT\\}")
+ "\"\""))
+ (substitute* "src/CMakeLists.txt"
+ ((".*Spglib_GitHash.*")
+ ""))))))
(build-system cmake-build-system)
(arguments
- '(#:test-target "check"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-header-install-dir
- (lambda _
- ;; As of the writing of this package, CMake and GNU build sy=
stems
- ;; install the header to two different location. This patch=
makes
- ;; the CMake build system's choice of header directory compa=
tible
- ;; with the GNU build system's choice and with what avogadro=
libs
- ;; expects.
- ;; See https://github.com/spglib/spglib/issues/75 and the re=
levant
- ;; part of https://github.com/OpenChemistry/avogadroapp/issu=
es/97.
- (substitute* "CMakeLists.txt"
- (("\\$\\{CMAKE_INSTALL_INCLUDEDIR\\}" include-dir)
- (string-append include-dir "/spglib")))
- #t)))))
+ '(#:tests? #f
+ #:configure-flags '("-DSPGLIB_WITH_TESTS=3DOFF")
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'patch-header-install-dir
+ (lambda _
+ ;; As of the writing of this package, CMake and GNU=
build systems
+ ;; install the header to two different location. T=
his patch makes
+ ;; the CMake build system's choice of header direct=
ory compatible
+ ;; with the GNU build system's choice and with what=
avogadrolibs
+ ;; expects.
+ ;; See https://github.com/spglib/spglib/issues/75 a=
nd the relevant
+ ;; part of https://github.com/OpenChemistry/avogadr=
oapp/issues/97.
+ (substitute* "CMakeLists.txt"
+ (("\\$\\{CMAKE_INSTALL_INCLUDEDIR\\}" include-dir=
)
+ (string-append include-dir "/spglib")))
+ #t)))))
(home-page "https://spglib.github.io/spglib/index.html")
(synopsis "Library for crystal symmetry search")
(description "Spglib is a library for finding and handling crystal
base-commit: f2229c2afdb32ddba46bce6f37aba812af39eec5
=2D-
2.48.1
--Jjo27NijAr/RneYV--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76728] (no subject)
References: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
In-Reply-To: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
Resent-From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 06 Mar 2025 14:59:02 +0000
Resent-Message-ID: <handler.76728.B76728.174127308531081 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76728
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76728 <at> debbugs.gnu.org
Received: via spool by 76728-submit <at> debbugs.gnu.org id=B76728.174127308531081
(code B ref 76728); Thu, 06 Mar 2025 14:59:02 +0000
Received: (at 76728) by debbugs.gnu.org; 6 Mar 2025 14:58:05 +0000
Received: from localhost ([127.0.0.1]:44684 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tqCfk-00085F-H2
for submit <at> debbugs.gnu.org; Thu, 06 Mar 2025 09:58:04 -0500
Received: from mout.web.de ([212.227.17.11]:54143)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <jakob.kirsch@HIDDEN>)
id 1tqCfh-00084c-Ip
for 76728 <at> debbugs.gnu.org; Thu, 06 Mar 2025 09:58:02 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de;
s=s29768273; t=1741273075; x=1741877875; i=jakob.kirsch@HIDDEN;
bh=OhroqgPvQgVoW5os0hacUNGju1+9Q5ruLJUcfCY0Qtc=;
h=X-UI-Sender-Class:Date:From:To:Message-ID:MIME-Version:
Content-Type:cc:content-transfer-encoding:content-type:date:from:
message-id:mime-version:reply-to:subject:to;
b=qFPrP6NLprYD5QibHtF/VRKwP+Rc5bUmJruqtd+lcj979FEIPwSA9ajfjuuKrJqH
zOBvmTDVVZfJxX2q7wRyd23VjOiRaCFbGsyMdoHHG0+AGeODktuxv0y7loBvbQQnQ
IzVvNH5FM6aN35fVi5OU8hsOyQBQ4hxFq2idgB0kYYdNoODofNPGRCZ5ei7bukblA
pQ4ZDzmSIRG53Jk7hqgGFOxRpjzoms7AOm4SlabB+1AzLmw6Ar+XpfbSG8oOimSCS
nXlpqvFIoYq5O9FP62ePu/zCfR1SVlvq+K743SUuQgGjL56ax67343RJUoLEMdiSD
e/LIVYj44xbnryHxZQ==
X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6
Received: from kernelpanicroom ([134.19.29.228]) by smtp.web.de (mrweb105
[213.165.67.124]) with ESMTPSA (Nemesis) id 1MOUtg-1tcVXJ0lJ8-00OxBz for
<76728 <at> debbugs.gnu.org>; Thu, 06 Mar 2025 15:57:55 +0100
Date: Thu, 6 Mar 2025 15:57:54 +0100
From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Message-ID: <Z8m38lf3HmYHkpJJ@kernelpanicroom>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Provags-ID: V03:K1:cHIqI8rIZfB18aCVp8P2KmI7Qy4l8lQKneD+KaoliTfKwqitHBF
q4aryP6cB1NRvHdHJteL5NIvL6+irpdV42IODrtxoHTxYGPW2QO9cMZiugVkYGFF0wAJ7rK
Yjm3RIuL632Zkv3Pl5z2nYTM3rR/LDxsQYqFwVDPXi7iyhgT+ve+sSQnmgPnMQ9oEtiqENZ
on7P9aApFqCmVMJjoZV9w==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:bNZuHQCXd54=;kbz7BgnPuUGYPkT+6IOKKfokOTX
1Yu8lhb6+wuKhT1yjSiC1Fiow1f0NKxPkSmNeu96ZNQpGr/ZC93mwGQvYWuogHPCw+v7ikVQW
HLuqBIiNvT5BqdvWVGReGBqg2RI8u3Ya2KsAHektry26sDxvXDNCespw7/Goy0LHczVri4jx9
Orv8EGL0WmV9OzJ1k/2XUpdvI7MvY+PxP2h2GOr5PakFhS3a/V0NXDBhSNOHge6EhGaSNor7k
I61YN3AmQ74fcuNDH5rkF+rBXafxQJtyj+ycQOIvMHZYjgD+O2Xsu/2HEorSYdT54h8rXItdT
ydJKMtS+JTS4ueqxz2tUQgnX9hCqfZXq0xl8BrsgvKrOUwO0BjxUQNMAvI6VDSDlA55zb0g+j
RA5R+VeiyTAobvGzhmZWRSOOH6EmT71WVhlFnagcSfVqtC9Spm8AH3bVBDCoCRqlzdE/c+BtC
1pKWA9yueUaGirKqVlXxzG3AlHCVQuulP7KNH0LlcSj/9Vie/Xw+CQehi8gs/ErDhCB//aQ36
0SGr0yRJiOmX2A1imWwY8PNCv7gNuQVQ5uxPxO6UE8vvIL+9vDAQH71rSflJjdAdK/isqS+bT
Lu5gAmaDhd4TiBlHk5TV4JQQFbR4qna/5WSEC4oQ8JgAAx5kISaCXohZ3PGIGhQEyIM5zYRaX
AKPUxvuQb7BVRrfUzHkdBtBTi/g1kNUMJCo7iDqzRUNUxCpMRHjVGAC5NdDTlVPbnQkFsS3GU
nzQn7T3n69Hpm5KFSEeRR/iHk3jEEj/fSLp8T8yNOmG7xpe/RSFwCE9A/tufpXqyPQKJ993Ee
NO/YRzDm3Xgnpvkz9vE5DoiuXr1Y+Mvl/8DJTV+YXR/tNc8P5w92n6rzL4Iv6GpXneYznMsKb
dzgnljk/4Y6PLWffT0nRePOsB0Nqaai9Z8kDK1+e/iRMpF5f1eUhvPYjhboUVdmkfCzgQwl4y
ddO39mcH11PueB5yC2WODuFfwR+GKemcDBBgfmI77DE80M1m3Cq+mEMlV5hVvn/0QU02/llSE
TUu1bvQu4CheFqftBwCwtjOLgpBvz7gz2PkQvbPqg52VZCM4W/Ytz8eqhJ4++Q7dRBm4URMwG
lPExR9Hc8zFAYYLj+XBVbiaRh6gYTzk5a0DN/zM2IslGBbS3SGXfy4Lf7p3APM+zIg/kboYey
UdHUAZcDRzl8e2vz2nhewUdhwMIq1k+sEsbUfHywb+BljLMVA+oOgBhJ/429Vsz7lyNmG9Xzy
Kga9c2jQz5qupraO/quqP/LRvjNfJxnkMXdi70ljhtrxZqvnh0wUBqVkf5mylsk+O/ROXJqul
6Qj5EPQwgAV5xHeyUKt7lcDDMUPzu3IqsnN6mNNv2a0UbhB37YQsGjLzqZeKLeDdihj9nCYQJ
DGGWdsUS4wzLhJQOwmcA8/cfiFQiLcA7g7cags2I213OUDlttKl0mZG2KO
X-Spam-Score: 1.3 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: This is still WIP as some things are broken like: * icons
don't render * openbabel optimization is broken with DNA
Content analysis details: (1.3 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[212.227.17.11 listed in bl.score.senderscore.com]
0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
The query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[212.227.17.11 listed in sa-accredit.habeas.com]
-0.0 SPF_PASS SPF: sender matches SPF record
-0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/,
low trust [212.227.17.11 listed in list.dnswl.org]
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (jakob.kirsch[at]web.de)
0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
[212.227.17.11 listed in wl.mailspike.net]
0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
1.8 MISSING_SUBJECT Missing Subject: header
0.2 NO_SUBJECT Extra score for no subject
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.3 (/)
This is still WIP as some things are broken like:
* icons don't render
* openbabel optimization is broken with DNA
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76728] PATCH v2
References: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
In-Reply-To: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
Resent-From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Fri, 07 Mar 2025 19:38:02 +0000
Resent-Message-ID: <handler.76728.B76728.174137625227851 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76728
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76728 <at> debbugs.gnu.org
Received: via spool by 76728-submit <at> debbugs.gnu.org id=B76728.174137625227851
(code B ref 76728); Fri, 07 Mar 2025 19:38:02 +0000
Received: (at 76728) by debbugs.gnu.org; 7 Mar 2025 19:37:32 +0000
Received: from localhost ([127.0.0.1]:50618 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tqdVj-0007F4-KX
for submit <at> debbugs.gnu.org; Fri, 07 Mar 2025 14:37:32 -0500
Received: from mout.web.de ([212.227.15.14]:57273)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <jakob.kirsch@HIDDEN>)
id 1tqdVf-0007Eo-9E
for 76728 <at> debbugs.gnu.org; Fri, 07 Mar 2025 14:37:30 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de;
s=s29768273; t=1741376240; x=1741981040; i=jakob.kirsch@HIDDEN;
bh=fizn9IekjuZ/+qfK0lDaTIM/PRk0XlxZXCp3aKLZ5TA=;
h=X-UI-Sender-Class:Date:From:To:Subject:Message-ID:MIME-Version:
Content-Type:cc:content-transfer-encoding:content-type:date:from:
message-id:mime-version:reply-to:subject:to;
b=WqsStt3RykJvJ3ssnCzWEREMNYCwZVfSuWBl79iZ4Nwrt/Hfskla+LY2r1aFg1Tv
SwsHee4Fq+eXgq8dweXp69Z3wisIcci7ZjfT8gLQOzVA5OR5F+qrZeCj6zmjYW70+
ARq57vATwje4nEx5Eg2nfDf8Pv1X1T9nvZ4d8P+DZG0u3q1kUwTU59QFo0bszE8gY
iMG8xsnTDLSGPMjXhLsKplrEWH1g/GIEDwqUiyjhO2OqDp7ylonCbFjqVeASaVToY
DLRSI+dmfa2lw/L3gAdqcS8W2FVNPmcp/DtjAICzwpoAh/AMXF02VBY4H8NmjCBWG
lbHhJyuV7jORPgx2OQ==
X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6
Received: from kernelpanicroom ([134.19.29.228]) by smtp.web.de (mrweb005
[213.165.67.108]) with ESMTPSA (Nemesis) id 1MZSBG-1tmlra2YSs-00Rr8V for
<76728 <at> debbugs.gnu.org>; Fri, 07 Mar 2025 20:37:20 +0100
Date: Fri, 7 Mar 2025 20:37:17 +0100
From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Message-ID: <Z8tK7S7oOKiC-QZY@kernelpanicroom>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="mqscGeM6pGqux1Ck"
Content-Disposition: inline
X-Provags-ID: V03:K1:9r76iHWxUByGmxQNDkWobxEfw47usQMZxlO/wA8e3LvM5Ow1QsI
qvz875zjqXpwQk8ynZOkcGzpR655ebclnALSRNTEEYkYYDE4zels55tdcXk8lV8IRSpjbZS
VMQVnfaBWFOE2+7eHvegw35TaBJxeucOP7llMnw2xUPjVWLQeIy3BmKFOB20Vn6bXPOT3Qg
LdMtW2kVTb4cn3zgOd1QQ==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:6snBI7nf1T4=;Pr8o5+qLvR4VAv/t7Yxy0/Hl6Kp
Y481hpGarBvPksqWkFv7fJ2aVduJX6F9GyYi+air2e1KV8ub31Bl0HfQoFzUpvEP8+zION89e
XbV//8aErpIH2j35Xqr2gwOMYAhmMGWvzKnrVuKtd3e/Yy6lR6WFJ1dY4/9F9Z4YDp55SZYXN
xru7e4vfprhtqN2PKwkKq2uDoy/ZdeBbIj3X7awjscPFhdHY/ZR/PX2WTnet9IaUdGxZsc71D
Q7wPcubDGvbC+jRAnrhA4zH0uqDn71slfcS7uZYi550kO7OYQAVg54jVtZ0PKr4CcsuCKHy3F
GSooJTZVX7L/xDLnvcpUyQCR5sJrmoDHtdStWuQuLyiZgnFMYp6wxlX8CN9eL27S3vWHVrv3k
Jys1E3V1msK0K6AHOOjmuRx3P/OWgazCYS8yFBdCJafzJ3ocqJMIyw+X+Drmj5iQgzbcc+6J0
eTvi0RXdmbqDIcPkpWyreuCUAxpZl/KQyiSdaRnnTfP5MC4+Q/de31tSR5QPgNiNpRHQhfhea
3fWYr4N/vqfBo8/5DNsHRxgfljnARo9/Mla1yrxxJJSP9vrzZd3AtC1NVtNKUdUb3yUzxzjCl
JDmqYQxbFFqBZ7+boljgTN16YMgMKi6i/OyJcf+drwlPnTCwO8etOY6BNriuF/QzGyGe3CCHH
AV+Nu9QnWBHeeIYR0YaXK8XYlx0fk0m+No5lAQVtrNwm8st1MOBcG+6njdUDyV55nL4bYxmHD
pqjxY0LinRxghdeaogd9rRHn+wWhWYoGdMrZkTTcZP/tCc13+vwWNMsGJEc5zu9+fnh/yq2qo
on9kGilv5eJ3GL5KsXJP720IcbzN/LnwkYFhjSfxGnjqJ+CbOnVQsQRreRsoqu7HSY3r55jmL
/9jwkC1jGG3B/r4PuWumN7kTzaQiXwkegWw1bYywdZr9C087TgRNpCPpxWh/qqgeUvRwjmToH
lC3/Ecxh28AqWglDdFVi5+2UBRG8vN2qyXl9sGYVJyvFXua4mG6UpPLpY3Qv5xO+WREq9/v8y
XMRTTmyddt7svjCWde7ajmZUXz3f+iAKg0r/bYi1GhvPYtUKj3Rqc60byaA/p4LfiBwemt2k8
8BwXkGkWguos5lTi0PyJS9VgnJBwNENxX7aUZk+VUvh2hjw8iW1lBVwudd6zGWDF/pMvyfyVL
vhmuslkPBX9zmsNe1tZ4vmI3rbfYxUGD3Wc6tBXez/uhZgPLo1h9mQQQG6FqxAgKLoaH7wEDr
TEpvVAOIrFjbAR6CSFLLJBvTyA8UhrOaBBc+y/acJxEp6Ml9XOQxbeemmutX5yrqGKuQ9kXFY
xsY/P/McY2xKgrugUjByNStKhiYtZ7jMQXhYmNRyiHr5YBx8VrxbMiw9Aa3WUwk2w5cEOTFr2
SUB4zhH83jJMaNqqCbVaWUF1XB8hZ0+ieBgvKqsGZnQCEmDtFCFyp3sGr8tafwGL7jjd+Lbcj
gq6x7tl1I0t3n0BCv080ClJZNCro=
X-Spam-Score: 0.0 (/)
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 (-)
--mqscGeM6pGqux1Ck
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
I changed some stuff (don't remember what tho). Still WIP.
--mqscGeM6pGqux1Ck
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: attachment;
filename="v2-0001-Update-avogadro2-to-1.100.patch"
Content-Transfer-Encoding: quoted-printable
=46rom 372abf8bb087488d0453cfa0ed82837636466b0e Mon Sep 17 00:00:00 2001
Message-ID: <372abf8bb087488d0453cfa0ed82837636466b0e.1741376160.git.jakob=
.kirsch@HIDDEN>
From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Date: Thu, 6 Mar 2025 15:51:33 +0100
Subject: [PATCH v2] Update avogadro2 to 1.100
Change-Id: Ia97823f9950a587b52b274b17338102cf4340e71
=2D--
gnu/packages/chemistry.scm | 211 ++++++++++++++++++++++++++++---------
1 file changed, 164 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index bd27bfad7a..05eefd52f4 100644
=2D-- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -7,6 +7,7 @@
;;; Copyright =A9 2020 Vincent Legoll <vincent.legoll@HIDDEN>
;;; Copyright =A9 2021 Ricardo Wurmus <rekado@HIDDEN>
;;; Copyright =A9 2022, 2023, 2024 David Elsing <david.elsing@HIDDEN>
+;;; Copyright =A9 2025 Jakob Kirsch <jakob.kirsch@HIDDEN>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -67,13 +68,75 @@ (define-module (gnu packages chemistry)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python))
+(define-public avogadro-molecules
+ (package
+ (name "avogadro-molecules")
+ (version "1.100")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openchemistry/molecules")
+ (commit "8a37883")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "00mfx0bwmqazbiklrvaijjd5n4wa5lp3z73291ihm78q0v9dzhl4")))=
)
+ (build-system copy-build-system)
+ (home-page "https://two.avogadro.cc/")
+ (synopsis "Common molecule fragments for visualization in Avogadro")
+ (description
+ "Common molecule fragments including a variety of organic functional=
groups.")
+ (license license:bsd-3)))
+
+(define-public avogadro-crystals
+ (package
+ (name "avogadro-crystals")
+ (version "1.100")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openchemistry/crystals")
+ (commit "28404bd")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0kcz99q5nfl2v2qmm9cqnbb2c2qqzw79vsnv557i7x64bxsxrw1m")))=
)
+ (build-system copy-build-system)
+ (home-page "https://two.avogadro.cc/")
+ (synopsis
+ "Crystallographic files of common materials, elements, oxides, for v=
isualization in Avogadro")
+ (description
+ "Crystal structures of over 500 common materials, elements, oxides."=
)
+ (license license:bsd-3)))
+
+(define-public avogadro-fragments
+ (package
+ (name "avogadro-fragments")
+ (version "1.100")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openchemistry/fragments")
+ (commit "c4943b5")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "17l6qmkc25wb0nvic708l25fxiy89b3vfs0x5d40qcnn27bid32n")))=
)
+ (build-system copy-build-system)
+ (home-page "https://two.avogadro.cc/")
+ (synopsis "Molecular fragments for Avogadro")
+ (description
+ "Molecular fragments and inorganic ligands for rapidly building stru=
ctures")
+ (license license:bsd-3)))
+
(define-public avogadrolibs
(package
(name "avogadrolibs")
- (version "1.93.0")
+ (version "1.100.0")
(source
(origin
(method git-fetch)
@@ -81,28 +144,33 @@ (define-public avogadrolibs
(url "https://github.com/OpenChemistry/avogadrolibs")
(commit version)))
(sha256
- (base32 "1xivga626n5acnmwmym8svl0pdri8hkp59czf04ri2zflnviyh39"))
+ (base32 "1l9bp3ba8yx9mk2in5v375jzi1w4y7l1xl37xqv869810drgjffc"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
- (native-inputs
- (list eigen
- mmtf-cpp
- googletest
- pkg-config
- pybind11))
- (inputs
- (list glew
- libarchive
- libmsym
- molequeue
- python
- spglib
- qtbase-5))
+ (native-inputs (list eigen mmtf-cpp googletest pkg-config pybind11))
+ (inputs (list glew
+ libarchive
+ libmsym
+ molequeue
+ python
+ spglib
+ qtbase-5
+ qtsvg-5
+ avogadro-molecules
+ avogadro-crystals
+ avogadro-fragments))
(arguments
- '(#:configure-flags (list "-DENABLE_TESTING=3DON"
- (string-append "-DSPGLIB_INCLUDE_DIR=3D"
- (assoc-ref %build-inputs "s=
pglib")
- "/include"))))
+ (list
+ #:configure-flags
+ #~(list "-DENABLE_TESTING=3DON")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'symlink
+ (lambda _
+ (begin
+ (symlink #$avogadro-molecules "../molecules")
+ (symlink #$avogadro-crystals "../crystals")
+ (symlink #$avogadro-fragments "../fragments")))))))
(home-page "https://www.openchemistry.org/projects/avogadro2/")
(synopsis "Libraries for chemistry, bioinformatics, and related areas=
")
(description
@@ -111,10 +179,30 @@ (define-public avogadrolibs
bioinformatics, materials science, and related areas.")
(license license:bsd-3)))
+(define-public avogadro-i18n
+ (package
+ (name "avogadro-i18n")
+ (version "1.100")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/openchemistry/avogadro-i18n")
+ (commit "07bee85")))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1vhjh0gilmm90269isrkvyzwwh1cj3bwcxls394psadw1a89mk14")))=
)
+ (build-system copy-build-system)
+ (home-page "https://two.avogadro.cc/")
+ (synopsis "Translations for Avogadro app and libraries")
+ (description
+ "Translations for the Avogadro app and libraries. Contributions and =
edits are always welcome through Weblate.")
+ (license license:bsd-3)))
+
(define-public avogadro2
(package
(name "avogadro2")
- (version "1.93.0")
+ (version "1.100.0")
(source
(origin
(method git-fetch)
@@ -122,17 +210,28 @@ (define-public avogadro2
(url "https://github.com/OpenChemistry/avogadroapp")
(commit version)))
(sha256
- (base32
- "1z3pjlwja778a1dmvx9aqz2hlw5q9g3kqxhm9slz08452600jsv7"))
+ (base32 "19cd5aqvcw6xj0x1kmzmxl0vrnbhk5ymnl9p2p4d9504ma5k6aim"))
(file-name (git-file-name name version))))
(build-system cmake-build-system)
- (native-inputs
- (list eigen pkg-config))
- (inputs
- (list avogadrolibs hdf5 molequeue qtbase-5))
+ (native-inputs (list eigen pkg-config avogadro-i18n))
+ (inputs (list avogadrolibs hdf5 molequeue qtbase-5))
;; TODO: Enable tests with "-DENABLE_TESTING" configure flag.
(arguments
- '(#:tests? #f))
+ (list
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'symlink
+ (lambda _
+ (begin
+ (symlink #$avogadro-i18n "../avogadro-i18n"))))
+
+ (add-after 'install 'wrap-program
+ (lambda _
+ (wrap-program (string-append #$output "/bin/avogadro2")
+ (list "PATH"
+ 'suffix
+ (list (string-append #$openbabel "/bin")))))))))
(home-page "https://www.openchemistry.org/projects/avogadro2/")
(synopsis "Advanced molecule editor")
(description
@@ -481,7 +580,7 @@ (define-public openbabel
(define-public spglib
(package
(name "spglib")
- (version "1.16.0")
+ (version "2.5.0")
(source
(origin
(method git-fetch)
@@ -489,26 +588,44 @@ (define-public spglib
(url "https://github.com/spglib/spglib")
(commit (string-append "v" version))))
(sha256
- (base32 "1kzc956m1pnazhz52vspqridlw72wd8x5l3dsilpdxl491aa2nws"))
- (file-name (git-file-name name version))))
+ (base32 "0x5igrqwx7r2shysmi9sqcjg4hpb7hba3ddlwg05z6c57a3ifbqc"))
+ (file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet #~(begin
+ (substitute* "CMakeLists.txt"
+ (("include\\(cmake/DynamicVersion.cmake\\)")
+ "")
+ (("dynamic_version.*")
+ "")
+ (("PROJECT_PREFIX.*")
+ "")
+ (("FALLBACK_VERSION.*")
+ "set (PROJECT_VERSION 2.5.0")
+ (("\\$\\{PROJECT_VERSION_FULL\\}")
+ "2.5.0")
+ (("\\$\\{GIT_COMMIT\\}")
+ "\"\""))
+ (substitute* "src/CMakeLists.txt"
+ ((".*Spglib_GitHash.*")
+ ""))))))
(build-system cmake-build-system)
(arguments
- '(#:test-target "check"
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'patch-header-install-dir
- (lambda _
- ;; As of the writing of this package, CMake and GNU build sy=
stems
- ;; install the header to two different location. This patch=
makes
- ;; the CMake build system's choice of header directory compa=
tible
- ;; with the GNU build system's choice and with what avogadro=
libs
- ;; expects.
- ;; See https://github.com/spglib/spglib/issues/75 and the re=
levant
- ;; part of https://github.com/OpenChemistry/avogadroapp/issu=
es/97.
- (substitute* "CMakeLists.txt"
- (("\\$\\{CMAKE_INSTALL_INCLUDEDIR\\}" include-dir)
- (string-append include-dir "/spglib")))
- #t)))))
+ '(#:tests? #f
+ #:configure-flags '("-DSPGLIB_WITH_TESTS=3DOFF")
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'patch-header-install-dir
+ (lambda _
+ ;; As of the writing of this package, CMake and GNU=
build systems
+ ;; install the header to two different location. T=
his patch makes
+ ;; the CMake build system's choice of header direct=
ory compatible
+ ;; with the GNU build system's choice and with what=
avogadrolibs
+ ;; expects.
+ ;; See https://github.com/spglib/spglib/issues/75 a=
nd the relevant
+ ;; part of https://github.com/OpenChemistry/avogadr=
oapp/issues/97.
+ (substitute* "CMakeLists.txt"
+ (("\\$\\{CMAKE_INSTALL_INCLUDEDIR\\}" include-dir=
)
+ (string-append include-dir "/spglib")))
+ #t)))))
(home-page "https://spglib.github.io/spglib/index.html")
(synopsis "Library for crystal symmetry search")
(description "Spglib is a library for finding and handling crystal
base-commit: 9bc4c9f521caab8aa8d88aa948a650945bb55838
=2D-
2.48.1
--mqscGeM6pGqux1Ck--
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76728] PATCH v2
Resent-From: Andreas Enge <andreas@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 08 Apr 2025 11:10:01 +0000
Resent-Message-ID: <handler.76728.B76728.174411058414890 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76728
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Jakob Kirsch <jakob.kirsch@HIDDEN>
Cc: bavier@HIDDEN, sharlatanus@HIDDEN, 76728 <at> debbugs.gnu.org
Received: via spool by 76728-submit <at> debbugs.gnu.org id=B76728.174411058414890
(code B ref 76728); Tue, 08 Apr 2025 11:10:01 +0000
Received: (at 76728) by debbugs.gnu.org; 8 Apr 2025 11:09:44 +0000
Received: from localhost ([127.0.0.1]:59347 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u26ps-0003s4-40
for submit <at> debbugs.gnu.org; Tue, 08 Apr 2025 07:09:44 -0400
Received: from hera.aquilenet.fr ([185.233.100.1]:41402)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <andreas@HIDDEN>) id 1u26pp-0003rC-5v
for 76728 <at> debbugs.gnu.org; Tue, 08 Apr 2025 07:09:41 -0400
Received: from localhost (localhost [127.0.0.1])
by hera.aquilenet.fr (Postfix) with ESMTP id 0DA3129C;
Tue, 8 Apr 2025 13:09:33 +0200 (CEST)
Authentication-Results: hera.aquilenet.fr;
none
X-Virus-Scanned: Debian amavis at hera.aquilenet.fr
Received: from hera.aquilenet.fr ([127.0.0.1])
by localhost (hera.aquilenet.fr [127.0.0.1]) (amavis, port 10024) with ESMTP
id 3ZxtgvtLoLcz; Tue, 8 Apr 2025 13:09:32 +0200 (CEST)
Received: from jurong (176-179-191-150.abo.bbox.fr [176.179.191.150])
by hera.aquilenet.fr (Postfix) with ESMTPSA id 905C155;
Tue, 8 Apr 2025 13:09:30 +0200 (CEST)
Date: Tue, 8 Apr 2025 13:09:28 +0200
From: Andreas Enge <andreas@HIDDEN>
Message-ID: <Z_UD6A2vpK2mu-Zw@jurong>
References: <Z8tK7S7oOKiC-QZY@kernelpanicroom>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <Z8tK7S7oOKiC-QZY@kernelpanicroom>
X-Rspamd-Server: hera
X-Spamd-Bar: +++++
X-Rspamd-Queue-Id: 0DA3129C
X-Spamd-Result: default: False [5.40 / 15.00]; SPAM_FLAG(5.00)[];
NEURAL_SPAM(3.00)[1.000]; BAYES_HAM(-3.00)[99.99%];
MID_RHS_NOT_FQDN(0.50)[]; MIME_GOOD(-0.10)[text/plain];
RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2];
FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+];
FREEMAIL_TO(0.00)[web.de]; ARC_NA(0.00)[];
TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[];
TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[];
FREEMAIL_ENVRCPT(0.00)[gmail.com,web.de];
RCPT_COUNT_THREE(0.00)[4];
FREEMAIL_CC(0.00)[debbugs.gnu.org,posteo.net,gmail.com]
X-Spam-Level: *****
X-Rspamd-Action: greylist
X-Spam-Score: 0.0 (/)
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 (-)
Hello Jakob,
Am Fri, Mar 07, 2025 at 08:37:17PM +0100 schrieb Jakob Kirsch:
> I changed some stuff (don't remember what tho). Still WIP.
are you still progressing, or should we close this issue?
Andreas
X-Loop: help-debbugs@HIDDEN
Subject: [bug#76728] (no subject)
References: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
In-Reply-To: <Z8ZNlSc-d6XXvY6_@kernelpanicroom>
Resent-From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 10 Apr 2025 16:22:01 +0000
Resent-Message-ID: <handler.76728.B76728.174430211127802 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 76728
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 76728 <at> debbugs.gnu.org
Received: via spool by 76728-submit <at> debbugs.gnu.org id=B76728.174430211127802
(code B ref 76728); Thu, 10 Apr 2025 16:22:01 +0000
Received: (at 76728) by debbugs.gnu.org; 10 Apr 2025 16:21:51 +0000
Received: from localhost ([127.0.0.1]:46443 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1u2uf0-0007EM-N3
for submit <at> debbugs.gnu.org; Thu, 10 Apr 2025 12:21:50 -0400
Received: from mout.web.de ([212.227.15.3]:36177)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <jakob.kirsch@HIDDEN>)
id 1u2uex-0007E2-Ut
for 76728 <at> debbugs.gnu.org; Thu, 10 Apr 2025 12:21:48 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de;
s=s29768273; t=1744302101; x=1744906901; i=jakob.kirsch@HIDDEN;
bh=w7LDIn6xKeya5RKHU6dKVqMPKGcGiOEo9o6jBqkNPbk=;
h=X-UI-Sender-Class:Date:From:To:Message-ID:MIME-Version:
Content-Type:cc:content-transfer-encoding:content-type:date:from:
message-id:mime-version:reply-to:subject:to;
b=iKDhUH+4xLI+NVsrEkDR5g6mD6ZjcIsUTS/9raaVJ3Id500/I0BLF0agSTDFN9i7
DKZSGAJZOucbZlByyId4Unu/WZEnsnJORfJxCpRpJ1xfyeWb27wbi7Iq+tHvX0DwZ
W/UbC9BIinh+7VRhNM26m2AUuc50BNgG+QQ4AJtcOjRzrZ1imKtSY3T6jpRc/AeMx
ldG9obaFGYO5kcCGMPnmB8tC8wrQ7hfUQUYErX7shapnEzfsWNosrdB90SfXZ5OE8
sLLzyXJJLqy4ECO42EkZJEo3l/lqOxZb77nC9IuN7HR6HodVgOEGqENJZzHfWdtZ/
TaCjoCtfsUj2elZMYg==
X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6
Received: from kernelpanicroom ([134.19.24.167]) by smtp.web.de (mrweb006
[213.165.67.108]) with ESMTPSA (Nemesis) id 1Mq1CA-1tFmP11Dxy-00ft0X for
<76728 <at> debbugs.gnu.org>; Thu, 10 Apr 2025 18:21:41 +0200
Date: Thu, 10 Apr 2025 18:21:39 +0200
From: Jakob Kirsch <jakob.kirsch@HIDDEN>
Message-ID: <Z_fwE2efXGyUcMYQ@kernelpanicroom>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
X-Provags-ID: V03:K1:sqNDEEGhuaGXBLvYRyRxf+l38EAvE7Dz3DgC8A/2/lBaQqLzyRw
6Q9pmWzIlWmCqvoKli0Bg9VCy77STMRPMHXU1weGBCFtEzB/8fEdi3Z5TOMz6MlhtMGEoSH
KayhaRbsMCZrbpLRI2dSxOyr77Mvqus/EfsgZGtIDbFS4QejkYb8fjSGJ6nUpkSvbztGGhL
/g9zZHIY5Kv9G0mbd3Vqw==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:9QlGW5E4IQw=;B2//hMT6nmUCG9eBeLyx8E7cjbL
o3vpxFyb+oVWhsgGckAchCgTRfsRkUrOH3e6458t/L3IQD9vcsW57uK4wzxgfr/YkbsGCNIOK
00yxAykpOlRQjXrYrpLf1DDjXPFlxYIQMLhsx/3iznD7EwXq81N4EA6oXuec16CMCMbODx7LU
7hDuZkJHYMg6AK8CHvIRWG80TqY9t4YvZBB354II6d3jx3XYsHUtcnvaW5pzTztlB+QzSJmrK
ui0vhKoSipWvRVUknfHvQ9IY6/dIOoTNA1EpEMJoDzvWcoJhPGb+otC2ne9rZE7KlGG/r0phb
Jpdbr944brfIWX/SXEEWRhvuYDNpdJkSbmoApcciY5vDJFEQVDRX/o6ZrSyWM0QyU+/8TNt7r
mWvmO3ryic0Gc8Ic7EibOJiAtfUyRWr9cq+pZLNi/KHcsd9C0juK4soHQ3n3f3xFHfmEzJi2D
7FUJCx1Uw1v82qynPDd1wfmooRkUGzXMkFHvtAOM49UmyH7VhF855rtzeKFgalRROwZvi7LDY
jlaBGzmP7OWVyZUlLj85E1VMHj9Ge3FsRutMEnlMSmOAgcmuO7dmeveZ4BWe492f+6sK5eNZx
oUF991gSoAncvvXDdfpLRD+pm/KKuPC087oAtIFB9OI3sR49rDhRVZsCisF7G9/SqBLH9Xz2i
WiUGRfbJ5NhV7Kso1hgosouMDHsE69RO6boivdPjLNHfVROX5dWlC7QyDXMy/gC5IAfwL9vhk
zM+UPJod0N897Q6X0qLBAStFDqUtXjjEHhrniDoB5aNwYIkcRTC2MJVnkTUY0bOUGliFJ/+zu
UYudhB2i5HTCZC8BU1L1daDskeT8zqHyQwiwNm/dSrK7c+y0A1rhSIKV8xPZ/oKPfWcqoHees
U45T0a2XpIleFnscaHog4x80LWRy9fLTCFaFq9BrdMtfMQMTkxPUpUjZcTa4UkcNHtSMEwfZu
4aDdo14O6+nfNX9vvH8qddutNdnltPVa4IYR8y3ibfhFzqc5PrK767Publ3dDgE3Xci9ghf4S
ZBt8D+7CTh3VC5X0Iod8w3HR9s8xgG3OQeIVepUg02vnM34r1LQ/nXp60Bzwq6Axho+wzsayA
cOZJH52GtGVOxGZGdLm0uUvcQ/7prOMM+U7Ueg4mD2HwT6BmtbZqP7oDXKo7vJHnTmyzMXzFT
7C9+mKLOg+WSiqcBhO+tyt3sNj+RITOek9jPZyF0fROqqeAwjiHQrUo+xtHwPxl9AstOJSS1Y
96KrLz+lgelgiMo+bZ7g/FpTvmdPLi+2oLWH3Z1v/eGk1QsuRK+9+18kcxkQyT8b6Z4JjVYUW
xqhy56yEzueS2bWCEOoDUdywgkoZWG+6uiKz+gP3C04XZfZAjQ6KSPt7z+SYfSYnH2fnySnxG
J51PvVcGT2tNW7bx87Ggj9QX8sDrYPFM/UzbNklkUK8GlruxxTL2/kcKo7n16qB5J1lnGpbAF
2nj5BRpf6TJzzsvEIvUzzTtz+0CsSKO9+c6CiwWSeL8sF8seVQWZFvMB3bahrPI24u05n9jKA
/gMtTmXWk785swZCajlL5XOLqm9D2tqjG0Qt00AR4VNpxSLNFa+VTCzVOApQpsWNQHJNJ++C0
pRmdAweer2IrwSKjAasdoazdQdGcuNzSVopXHwpqInyf8EVa++KvpUeCWHPEahGzdoNMicwwI
ph7RcYHoFmOn2fg1pCQbZQzQ3FHRJUg/GIGhvf9JGnxXOlJvdaeSydxG57HDJIn1q3Zu+XRbu
IImfqPdDhYxT2UXfhsK3XVzoGaHupSQf5JG4TI/MFAFgc4MSZM4glXLXMsAkLXpJtTrw20fGK
sFh4e1r+Q/myv5o/w3e+aomhriN4X+EF0Mh5Ycj6iQAHyvrupbBSpYXSUI/bqr3WlGc+Ty1HN
lYrLtjD7fxigW7AhyYPG25P603haU3hZEe8uFnBHqFCt/CIPzOjdNp38ahUXjncu6KEF5aTSi
R8+pUuLe68Xn7Ylij2Q5Z/1ebs9wSZ6m4a9qe6YemxdBCYLXwMcuswl6nMovK1nSoWB74NobC
mELPnTmWiYMZPGYF+zvg6UAXhXDmbIejuPbOK0+7mjKBTDfVBe3BZM0s+7xdXwNtKdItTZwh0
QKnGmMfQSAJVj7GeIk5ll0if8cdbZ+UPz+EffCEfYZhl1fK6bFz1MBwLGyUDna34h5hfJ9xKH
Y4wSstq2v2++LhxqbBSSwI3bWm0Z4V2yYnaC78sAaW6dSqhNTVDFLSeSZfmN+aZw0ORIxW2kw
TdtTDYG+9q8hY/7B/EBghJIgFQBaVvleV2Bi/fmrbaob0ceCWZ41kQfYkdbrTvc4c19YHgxwj
+aWHqcHOatCNTmAcsi9VWK3yz23Hi+pXv3MK366mdUNJA/cgn17rwrhFMkkXcDWHdeJUxq6BT
8wp9LCXlmYTFgYZ1zbNAD1gLiqK43h6+r7M4OaXVRkyPWgiQORaUyqjz69vVnegtJBPUa2JxZ
hPvVIL9e114f7tsUa9KrAjarwm2VQDxfGGKLw+CpEcQAJzehuYPuPVvcQXFgZASVeFITCDiOY
TVVArBdAk2USvo/xCDO4oQkNg7Bcl2m75ogMTQ/nvHhs8UOndDjQtPIJ24o/qae6oPe8+U6sd
2ZVKUHeQk2fTyKScPoJY7AmzAF3YPTp22w0X7oq/jYVVSN8ob7hbwJO0LY8MDIaFaOJq1GxBM
IHFb5gRARBanC+3EmWxa4hrUaFr8iXKTtb99uoKFXQhDXwkbfLcQ0RjFm3TJ/aiV9ilPz0Ew3
pk1UgLsEQxVGoXk
X-Spam-Score: 1.3 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: Currently working on it, it's still broken for some reason.
Content analysis details: (1.3 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
The query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[212.227.15.3 listed in sa-trusted.bondedsender.org]
0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
query to Validity was blocked. See
https://knowledge.validity.com/hc/en-us/articles/20961730681243
for more information.
[212.227.15.3 listed in bl.score.senderscore.com]
-0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/,
low trust [212.227.15.3 listed in list.dnswl.org]
-0.0 SPF_PASS SPF: sender matches SPF record
0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (jakob.kirsch[at]web.de)
0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
[212.227.15.3 listed in wl.mailspike.net]
1.8 MISSING_SUBJECT Missing Subject: header
0.2 NO_SUBJECT Extra score for no subject
0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
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.3 (/)
Currently working on it, it's still broken for some reason.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.