Received: (at 76240) by debbugs.gnu.org; 21 Feb 2025 11:26:39 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 21 06:26:38 2025
Received: from localhost ([127.0.0.1]:55199 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tlRB0-0006lH-9C
for submit <at> debbugs.gnu.org; Fri, 21 Feb 2025 06:26:38 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10]:54722)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tlRAy-0006kK-Dy
for 76240 <at> debbugs.gnu.org; Fri, 21 Feb 2025 06:26:37 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ludo@HIDDEN>)
id 1tlRAq-0007lB-No; Fri, 21 Feb 2025 06:26:28 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To:
From; bh=7EymA4F6p5Cx55pjMDhxSt6/6OMCHssaSh8q40iwMmY=; b=bbcrbOTiNchy9Yw4RqZZ
f6SW0O2DD8I4BCS07qcW6vf45ccx6xpLHjw+ucD5yIBd4F6De8RYoIx2hInPU1IBlVNySP6qnIaX1
lmuYekSjagZFRbNmWlYzE7LS7gXI8da2WpZCdrAmPu8utabTCvJeWzOmGT7Xi/qyywUBgskQgCnkm
u7iSfGDEphEEZR+JMp96aelpS3voqLDh7gs8P3UDXQc4AJcX9iwgYO4BA7CS7e+4D45mhiWkW9Fpe
7r9kxgsCAZeY8/pJ/MWe87lD9dzcDKyi0i4Dna22PeD8EKVbeOLCBhiZqP6+pG9WRy3Ogcn0OUuAS
iE362CVS7T1CvQ==;
From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN>
To: Sharlatan Hellseher <sharlatanus@HIDDEN>
Subject: Re: [bug#76240] [PATCH] gnu: Add NumPy 2 related variants.
In-Reply-To: <878qq8znp8.fsf@HIDDEN> ("Ludovic =?utf-8?Q?Court=C3=A8s=22'?=
=?utf-8?Q?s?= message of "Fri, 14 Feb 2025 13:59:47 +0100")
References: <e2de75ba2392dbb0aa6021befea7d9a6b8c17959.1739393772.git.sharlatanus@HIDDEN>
<878qq8znp8.fsf@HIDDEN>
Date: Fri, 21 Feb 2025 12:26:26 +0100
Message-ID: <87msef8rod.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 76240
Cc: Tanguy Le Carrour <tanguy@HIDDEN>,
Munyoki Kilyungi <me@HIDDEN>, Lars-Dominik Braun <lars@HIDDEN>,
76240 <at> debbugs.gnu.org, jgart <jgart@HIDDEN>, Marius Bakke <marius@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: -3.3 (---)
Hey Oleg,
Ludovic Court=C3=A8s <ludo@HIDDEN> skribis:
> Sharlatan Hellseher <sharlatanus@HIDDEN> skribis:
>
>> This to make Pandas, MatplotLib and SciPy compatible with NumPy 2. They
>> need to be build with newer version otherwise it raise the error.
>>
>> * gnu/packages/python-science.scm: (python-pandas-with-numpy-2,
>> python-scipy-with-numpy-2): New variables.
>>
>> * gnu/packages/python-xyz.scm (python-matplotlib-with-numpy-2): New vari=
able.
>>
>> Change-Id: I53878b643ea6f7b35e3d893a18da438c2c111c52
>
> [...]
>
>> +(define-public python-scipy-with-numpy-2
>> + (package
>> + (inherit python-scipy)
>> + (propagated-inputs
>
> Comment for all of these: it should be =E2=80=98package/inherit=E2=80=99 =
(to potentially
> inherit replacements) and also change the =E2=80=98name=E2=80=99 field to=
distinguish
> it.
>
> Actually, assuming we want to move to NumPy 2.x going forward, I would
> suggest keeping the regular name for the -with-numpy-2 variants (like
> =E2=80=9Cpython-scipy=E2=80=9D) and choose a different name for the NumPy=
1.x variants
> (like =E2=80=9Cpython-scipy-with-numpy-1=E2=80=9D).
>
> That way, somebody running:
>
> guix shell python python-numpy python-scipy
This broke =E2=80=98tests/guix-pack-relocatable.sh=E2=80=99 for these reaso=
ns:
--8<---------------cut here---------------start------------->8---
+ guix pack -RR python-numpy python-scipy --no-grafts -n
guix pack: error: profile contains conflicting entries for python-numpy
guix pack: error: first entry: python-numpy@HIDDEN /gnu/store/i1g6wbcc0ilh=
cc5vy4pi70z58gk1716f-python-numpy-2.2.2R
guix pack: error: second entry: python-numpy@HIDDEN /gnu/store/2s1jala0jg=
56drh4hc19mrdg6w3gswhm-python-numpy-1.24.4R
guix pack: error: ... propagated from python-pythran@HIDDEN
guix pack: error: ... propagated from python-scipy@HIDDEN
hint: Backtrace:
--8<---------------cut here---------------end--------------->8---
Would be nice to address it before we get a deluge of angry bug reports.
:-)
Ludo=E2=80=99.
guix-patches@HIDDEN:bug#76240; Package guix-patches.
Full text available.Received: (at 76240) by debbugs.gnu.org; 14 Feb 2025 13:00:37 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Feb 14 08:00:37 2025 Received: from localhost ([127.0.0.1]:47532 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tivJ6-0008VB-S5 for submit <at> debbugs.gnu.org; Fri, 14 Feb 2025 08:00:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33012) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <ludo@HIDDEN>) id 1tivJ4-0008Up-EN for 76240 <at> debbugs.gnu.org; Fri, 14 Feb 2025 08:00:35 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <ludo@HIDDEN>) id 1tivIw-0001Dz-W3; Fri, 14 Feb 2025 08:00:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=e6K7T7XnHdAsJW2hdYqgYV/an0xXlIKlMwOmJbln8lc=; b=aOQ4hZWODGRP8kzetYwH QJKYm1GOoTDdM7LmamwKNA9tEJY3DzU/lNqYd49/C/AaB7RppWjOYDo+R4ddSRaaAD+reWqFgw6RH yw7Ufi1I73RuO0Z8onvuFh6IP3B8ymxnIu/1nog3JsJZSoO3ws3+24cOB8Gf+qYpzXuricefKXWom jFa0sE4YVZ/voJRwQg6wjRzMpJw41NiQhaM6qWS2qejMlYaWoH5tIJrcAD6kjgzVikzbKw5J/fZ2k V96opaQAcc/ACVY9GIj8Md+pQJzr2fvlHzD9MWHi5VKMTx0+MXshWpGYLfxB2MS99tel+4ksg2uyv adO/b+oL9gClfg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= <ludo@HIDDEN> To: Sharlatan Hellseher <sharlatanus@HIDDEN> Subject: Re: [bug#76240] [PATCH] gnu: Add NumPy 2 related variants. In-Reply-To: <e2de75ba2392dbb0aa6021befea7d9a6b8c17959.1739393772.git.sharlatanus@HIDDEN> (Sharlatan Hellseher's message of "Wed, 12 Feb 2025 20:58:39 +0000") References: <e2de75ba2392dbb0aa6021befea7d9a6b8c17959.1739393772.git.sharlatanus@HIDDEN> Date: Fri, 14 Feb 2025 13:59:47 +0100 Message-ID: <878qq8znp8.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 76240 Cc: Tanguy Le Carrour <tanguy@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, Lars-Dominik Braun <lars@HIDDEN>, 76240 <at> debbugs.gnu.org, jgart <jgart@HIDDEN>, Marius Bakke <marius@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: -3.3 (---) Hi! Sharlatan Hellseher <sharlatanus@HIDDEN> skribis: > This to make Pandas, MatplotLib and SciPy compatible with NumPy 2. They > need to be build with newer version otherwise it raise the error. > > * gnu/packages/python-science.scm: (python-pandas-with-numpy-2, > python-scipy-with-numpy-2): New variables. > > * gnu/packages/python-xyz.scm (python-matplotlib-with-numpy-2): New varia= ble. > > Change-Id: I53878b643ea6f7b35e3d893a18da438c2c111c52 [...] > +(define-public python-scipy-with-numpy-2 > + (package > + (inherit python-scipy) > + (propagated-inputs Comment for all of these: it should be =E2=80=98package/inherit=E2=80=99 (t= o potentially inherit replacements) and also change the =E2=80=98name=E2=80=99 field to d= istinguish it. Actually, assuming we want to move to NumPy 2.x going forward, I would suggest keeping the regular name for the -with-numpy-2 variants (like =E2=80=9Cpython-scipy=E2=80=9D) and choose a different name for the NumPy 1= .x variants (like =E2=80=9Cpython-scipy-with-numpy-1=E2=80=9D). That way, somebody running: guix shell python python-numpy python-scipy will still get a consistent package set. How does that sound? Thanks, Ludo=E2=80=99.
guix-patches@HIDDEN:bug#76240; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 12 Feb 2025 20:58:58 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Feb 12 15:58:58 2025
Received: from localhost ([127.0.0.1]:38632 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tiJov-0005qN-Ft
for submit <at> debbugs.gnu.org; Wed, 12 Feb 2025 15:58:57 -0500
Received: from lists.gnu.org ([2001:470:142::17]:44378)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <sharlatanus@HIDDEN>)
id 1tiJot-0005qA-Az
for submit <at> debbugs.gnu.org; Wed, 12 Feb 2025 15:58: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 <sharlatanus@HIDDEN>)
id 1tiJom-0004sA-Vq
for guix-patches@HIDDEN; Wed, 12 Feb 2025 15:58:49 -0500
Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <sharlatanus@HIDDEN>)
id 1tiJol-0004oD-AU
for guix-patches@HIDDEN; Wed, 12 Feb 2025 15:58:48 -0500
Received: by mail-wr1-x434.google.com with SMTP id
ffacd0b85a97d-38f1e8efe84so50764f8f.1
for <guix-patches@HIDDEN>; Wed, 12 Feb 2025 12:58:45 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1739393924; x=1739998724; darn=gnu.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=hBEABpiIhAoWV+vf6xMvHTXb0kFV5yTST8QEJDq52bE=;
b=YvnCV4M1jlZCVCi5pcZOlDc9mO17exMdNIkyrW0TbrX3q636TRyfAEQPeAh9Q9rx9p
g36k0sTb+mtD/Zb+HXtsAb05ppBTRYTKkv8jblvKl7Q0kREqecKB22j14kV5kDmq+y3H
ns0CuyzQ5kw3q1dSpWcfbWU8L+FckJcEDIgAl0ouPZXLoIxTm3lLZtxBvLhhKOmwaZyd
FIKzLkJNn6W7EaL1jYTW6XiAZW7Yteyx+Cf2yCYrNAQrA8JrFe50NV+oJCDXz8TGRgV1
IVOQ/4yYOs/WRkOI98OrNGP0EQWplEiNkMukza2GARxRo/Nn2L3X9lZINR6xkC0HkZQO
nM+g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1739393924; x=1739998724;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=hBEABpiIhAoWV+vf6xMvHTXb0kFV5yTST8QEJDq52bE=;
b=oRgUP6/IVXB6HUEwSnqoa+FEG9wV84Y09wblSm/y1vfInT3332/HxdlpvTWMbuUUpb
9d0IcSmRhNKJLv+D1K2TejEpDwQF1MTpXUwnK3nUVL0Xp0+ppI/9nbd/pnLbDBB3LLBX
QsDrlc5XYXz527JKFcfZPF5ugPucE3cuFWhFC6DTyS/r45DcoJc3IqZHY1SVhrnPNYxx
snh11616AL6fYLpvgR/WWuLbwL4ZBc4gGPnOsPXwLbV7Bp6bqcLzAxzuQAUAL5Ulm26C
3c9cTyWsC9b1UWReV5s6v6YmfSJgWEDx7xc15ghTUyBf30d9SG1+iA9KdsWCOu7fBEJj
k6/A==
X-Gm-Message-State: AOJu0YxLnwhSR78zKBWAv6D0Izl3ZNwg3c6m5m966gzztdeOp9RAey9P
CoUS6U81hNZ/rlWAPljPRBwx0xNpgMbvmh3PZsq52Grfdm4MNAWjFHFmVpJr
X-Gm-Gg: ASbGncv5NL+ZDBBzgZbzE3ESfu7wnUePGcwaiJce6bWbFwgOPPF2oeKbee5ionTVSAF
LKaxFcsdF/APZFBVrqA6PzWXzSX2iPUlpY78sRRlyJfa2ihzuzIUk/VTy4Os8HN4Lsb2qMllkWs
Bot1vmmUeDssqZP7lEJoGLOt8W16LQfcWnlaHo4NZZ61qNb4wSpS1n21675oG1PxlLGQ0v9v+Tm
osDl/yxQPcaFNovcOpMvbsjxGRUVabK8kGP7eix16c3/FfsBKbO9TLA+y6c+yQzOQGJ0JSfJH4q
c8aHKq8GbKvMcTIz7K5mmKikje6zpTaFlL6Rlz4+UBrsU7F7fXclrEVIZtvbYe1je4KgrO2+QoN
DzhoX5VM=
X-Google-Smtp-Source: AGHT+IH3Mr585kgiCbXC44zkXjIJuWyH2i2COln/HNYAtAWnmP/9ZQIuhCWYQABjXkIQx0CP5idmXw==
X-Received: by 2002:a5d:6da4:0:b0:385:e17a:ce61 with SMTP id
ffacd0b85a97d-38dea605267mr4266778f8f.53.1739393923616;
Wed, 12 Feb 2025 12:58:43 -0800 (PST)
Received: from guxtil.incerto.xyz
(cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200])
by smtp.gmail.com with ESMTPSA id
5b1f17b1804b1-4395a06d1f2sm29949295e9.18.2025.02.12.12.58.42
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 12 Feb 2025 12:58:43 -0800 (PST)
From: Sharlatan Hellseher <sharlatanus@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: Add NumPy 2 related variants.
Date: Wed, 12 Feb 2025 20:58:39 +0000
Message-ID: <e2de75ba2392dbb0aa6021befea7d9a6b8c17959.1739393772.git.sharlatanus@HIDDEN>
X-Mailer: git-send-email 2.47.1
MIME-Version: 1.0
X-Debbugs-Cc: Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>,
Munyoki Kilyungi <me@HIDDEN>,
Sharlatan Hellseher <sharlatanus@HIDDEN>,
Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a00:1450:4864:20::434;
envelope-from=sharlatanus@HIDDEN; helo=mail-wr1-x434.google.com
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, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
Cc: Sharlatan Hellseher <sharlatanus@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.0 (/)
This to make Pandas, MatplotLib and SciPy compatible with NumPy 2. They
need to be build with newer version otherwise it raise the error.
* gnu/packages/python-science.scm: (python-pandas-with-numpy-2,
python-scipy-with-numpy-2): New variables.
* gnu/packages/python-xyz.scm (python-matplotlib-with-numpy-2): New variable.
Change-Id: I53878b643ea6f7b35e3d893a18da438c2c111c52
---
gnu/packages/python-science.scm | 19 +++++++++++++++++++
gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++
2 files changed, 40 insertions(+)
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm
index 1f4cdb239a1..0332546d22d 100644
--- a/gnu/packages/python-science.scm
+++ b/gnu/packages/python-science.scm
@@ -475,6 +475,14 @@ (define-public python-scipy
routines such as routines for numerical integration and optimization.")
(license license:bsd-3)))
+(define-public python-scipy-with-numpy-2
+ (package
+ (inherit python-scipy)
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs python-scipy)
+ (replace "python-numpy" python-numpy-2)
+ (replace "python-matplotlib" python-matplotlib-with-numpy-2)))))
+
(define-public python-scikit-allel
(package
(name "python-scikit-allel")
@@ -1479,6 +1487,17 @@ (define-public python-pandas-2
(define-public python-pandas python-pandas-2)
+(define-public python-pandas-with-numpy-2
+ (package
+ (inherit python-pandas)
+ (native-inputs
+ (modify-inputs (package-native-inputs python-pandas)
+ (replace "python-numpy" python-numpy-2)
+ (replace "python-matplotlib" python-matplotlib-with-numpy-2)))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs python-pandas)
+ (replace "python-matplotlib" python-matplotlib-with-numpy-2)))))
+
(define-public python-pandas-stubs
(package
(name "python-pandas-stubs")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a4017fffe48..1fc6ebdb0b4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -10462,6 +10462,27 @@ (define-public python-matplotlib
toolkits.")
(license license:psfl)))
+(define-public python-matplotlib-with-numpy-2
+ (package
+ (inherit python-matplotlib)
+ (version "3.8.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "matplotlib" version))
+ (sha256
+ (base32 "1spzglb3hh3959z72iwspm9dsbf5zz2q3hri1sb5ihcybrykkb4a"))))
+ (arguments
+ (substitute-keyword-arguments
+ (package-arguments python-matplotlib)
+ ((#:tests? _ #t) #f)
+ ((#:phases phases #~%standard-phases)
+ #~(modify-phases #$phases
+ (delete 'sanity-check)))))
+ (propagated-inputs
+ (modify-inputs (package-propagated-inputs python-matplotlib)
+ (replace "python-numpy" python-numpy-2)))))
+
(define-public python-matplotlib-documentation
(package
(inherit python-matplotlib)
base-commit: c9abfacd9f58f7365668b67a8125640b7497932a
prerequisite-patch-id: a2254ccef49d23b75149b22b200b6156097b673f
prerequisite-patch-id: 4e4a0833f7c017f2922344883800161335290814
prerequisite-patch-id: 97653359db283a3832359fc4cd0dc1741a2f51bc
prerequisite-patch-id: 2eac1b43f9e9050e8467c89cd384da43bff63305
--
2.47.1
Sharlatan Hellseher <sharlatanus@HIDDEN>:lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN.
Full text available.lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN:bug#76240; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.