From patchwork Thu Jan 25 13:58:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 59379 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 58D4F27BBEA; Thu, 25 Jan 2024 13:59:26 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D53B827BBE2 for ; Thu, 25 Jan 2024 13:59:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT0Fx-000285-5z; Thu, 25 Jan 2024 08:59: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 ) id 1rT0Fv-00027I-BI for guix-patches@gnu.org; Thu, 25 Jan 2024 08:58:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT0Fs-0007R3-Fx for guix-patches@gnu.org; Thu, 25 Jan 2024 08:58:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rT0Fy-0000l9-7n; Thu, 25 Jan 2024 08:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68714] [PATCH 1/5] gnu: flint: Update to 3.0.1. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68714 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68714@debbugs.gnu.org Cc: Andreas Enge , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 68714-submit@debbugs.gnu.org id=B68714.17061911212864 (code B ref 68714); Thu, 25 Jan 2024 13:59:02 +0000 Received: (at 68714) by debbugs.gnu.org; 25 Jan 2024 13:58:41 +0000 Received: from localhost ([127.0.0.1]:47636 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT0Fc-0000k7-QE for submit@debbugs.gnu.org; Thu, 25 Jan 2024 08:58:41 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:50788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT0FU-0000jC-V1 for 68714@debbugs.gnu.org; Thu, 25 Jan 2024 08:58:34 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 218391064; Thu, 25 Jan 2024 14:58:21 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7Q5LAxCLQsTa; Thu, 25 Jan 2024 14:58:20 +0100 (CET) Received: from jurong.math.u-bordeaux1.fr (sauterelleold.math.u-bordeaux1.fr [147.210.16.130]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 52EFF348; Thu, 25 Jan 2024 14:58:20 +0100 (CET) From: Andreas Enge Date: Thu, 25 Jan 2024 14:58:02 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/algebra.scm (flint): Update to 3.0.1. [arguments]: Remove obsolete phase additions. Change-Id: Iebac9d3a0b1e19147df9402d522c55cb168148d7 --- gnu/packages/algebra.scm | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 8d1877e3d9..43047a9b32 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -417,41 +417,20 @@ (define-public giac (define-public flint (package (name "flint") - (version "2.9.0") + (version "3.0.1") (source (origin (method url-fetch) - (uri (string-append "http://flintlib.org/flint-" version ".tar.gz")) + (uri (string-append "https://flintlib.org/flint-" version ".tar.gz")) (sha256 - (base32 "0sp79ixaawjzna79afrlwlx9hg55jxil03f1wq435j9k23ar1h1g")))) + (base32 "1d4lawfvmjd4n7rp4z9xkwwjjbrjhkmxnxw1xf0ki1isa001lcbv")))) (build-system gnu-build-system) (inputs (list ntl)) (propagated-inputs (list gmp mpfr)) ; header files from both are included by flint/arith.h (arguments - `(#:parallel-tests? #f ; seems to be necessary on arm - #:phases - (modify-phases %standard-phases - (add-before 'configure 'newer-c++ - (lambda _ - (substitute* "configure" - (("-ansi") "")) - #t)) - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gmp (assoc-ref inputs "gmp")) - (mpfr (assoc-ref inputs "mpfr")) - (ntl (assoc-ref inputs "ntl"))) - ;; Do not pass "--enable-fast-install", which makes the - ;; homebrew configure process fail. - (invoke "./configure" - (string-append "--prefix=" out) - (string-append "--with-gmp=" gmp) - (string-append "--with-mpfr=" mpfr) - (string-append "--with-ntl=" ntl)) - #t)))))) + `(#:parallel-tests? #f)) ; seems to be necessary on arm (synopsis "Fast library for number theory") (description "FLINT is a C library for number theory. It supports arithmetic From patchwork Thu Jan 25 13:58:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 59380 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EC38A27BBEA; Thu, 25 Jan 2024 13:59:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4CD1527BBE2 for ; Thu, 25 Jan 2024 13:59:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT0Fy-00028I-Gv; Thu, 25 Jan 2024 08:59:02 -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 ) id 1rT0Fv-00027H-BM for guix-patches@gnu.org; Thu, 25 Jan 2024 08:58:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT0Fr-0007R0-W1 for guix-patches@gnu.org; Thu, 25 Jan 2024 08:58:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rT0Fx-0000l1-RG for guix-patches@gnu.org; Thu, 25 Jan 2024 08:59:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68714] [PATCH 2/5] gnu: pynac: Remove package. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 13:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68714 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68714@debbugs.gnu.org Cc: Andreas Enge Received: via spool by 68714-submit@debbugs.gnu.org id=B68714.17061911152833 (code B ref 68714); Thu, 25 Jan 2024 13:59:01 +0000 Received: (at 68714) by debbugs.gnu.org; 25 Jan 2024 13:58:35 +0000 Received: from localhost ([127.0.0.1]:47631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT0FX-0000jd-8J for submit@debbugs.gnu.org; Thu, 25 Jan 2024 08:58:35 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:33842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT0FV-0000jE-7I for 68714@debbugs.gnu.org; Thu, 25 Jan 2024 08:58:34 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id BBE9D1135; Thu, 25 Jan 2024 14:58:21 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PnNEiEufDHss; Thu, 25 Jan 2024 14:58:21 +0100 (CET) Received: from jurong.math.u-bordeaux1.fr (sauterelleold.math.u-bordeaux1.fr [147.210.16.130]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 076FA1149; Thu, 25 Jan 2024 14:58:21 +0100 (CET) From: Andreas Enge Date: Thu, 25 Jan 2024 14:58:03 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The package was integrated into the Sagemath source code in 2021. * gnu/packages/sagemath.scm (pynac): Remove variable. Change-Id: I5c6a90ed1747852d0dc4e73b79ce9daa34d876c7 --- gnu/packages/sagemath.scm | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index 242f890c0c..8d5d04ee93 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019, 2024 Andreas Enge +;;; Copyright © 2019 Andreas Enge ;;; Copyright © 2019 Nicolas Goaziou ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2020 Jakub Kądziołka @@ -170,33 +170,6 @@ (define-public libhomfly (license license:public-domain) (home-page "https://github.com/miguelmarco/libhomfly"))) -(define-public pynac - (package - (name "pynac") - (version "0.7.29") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pynac/pynac/") - (commit (string-append "pynac-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1h2b85rmmrsjnqk8z5d811r1lc0h64g7dyk7gfbwyapdcmx7pi51")))) - (build-system gnu-build-system) - (native-inputs - (list autoconf automake libtool pkg-config)) - (inputs - (list flint gmp python singular)) - (synopsis "Sage fork of GiNaC") - (description "Pynac is a derivative of the C++ library GiNaC, which -allows manipulation of symbolic expressions. It currently provides the -backend for symbolic expressions in Sage. The main difference between -Pynac and GiNaC is that Pynac relies on Sage to provide the operations -on numerical types, while GiNaC depends on CLN for this purpose.") - (license license:gpl2+) - (home-page "http://pynac.org/"))) - ;; Sage has become upstream of the following package. (define-public zn-poly (package From patchwork Thu Jan 25 13:58:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 59381 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F32E727BBE9; Thu, 25 Jan 2024 13:59:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4454D27BBE2 for ; Thu, 25 Jan 2024 13:59:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT0G1-00029P-St; Thu, 25 Jan 2024 08:59:05 -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 ) id 1rT0Fv-00027J-CX for guix-patches@gnu.org; Thu, 25 Jan 2024 08:58:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT0Fu-0007RQ-Py for guix-patches@gnu.org; Thu, 25 Jan 2024 08:58:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rT0Fz-0000la-NW; Thu, 25 Jan 2024 08:59:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68714] [PATCH 3/5] gnu: s7: Compile with flint@3. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: glv@posteo.net, cox.katherine.e+guix@gmail.com, me@bonfacemunyoki.com, sharlatanus@gmail.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 13:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68714 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68714@debbugs.gnu.org Cc: Andreas Enge , Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart X-Debbugs-Original-Xcc: Guillaume Le Vaillant , Katherine Cox-Buday , Munyoki Kilyungi , Sharlatan Hellseher , jgart Received: via spool by 68714-submit@debbugs.gnu.org id=B68714.17061911232886 (code B ref 68714); Thu, 25 Jan 2024 13:59:03 +0000 Received: (at 68714) by debbugs.gnu.org; 25 Jan 2024 13:58:43 +0000 Received: from localhost ([127.0.0.1]:47642 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT0Fe-0000kQ-92 for submit@debbugs.gnu.org; Thu, 25 Jan 2024 08:58:43 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]:58880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT0FY-0000jG-7J for 68714@debbugs.gnu.org; Thu, 25 Jan 2024 08:58:38 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id CD20B115E; Thu, 25 Jan 2024 14:58:22 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ip4wZlkU0zqg; Thu, 25 Jan 2024 14:58:21 +0100 (CET) Received: from jurong.math.u-bordeaux1.fr (sauterelleold.math.u-bordeaux1.fr [147.210.16.130]) by hera.aquilenet.fr (Postfix) with ESMTPSA id BE4BA115A; Thu, 25 Jan 2024 14:58:21 +0100 (CET) From: Andreas Enge Date: Thu, 25 Jan 2024 14:58:04 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/s7-flint-3.patch: New file. * gnu/local.mk (dist_patch_DATA): Register file. * gnu/packages/lisp.scm (s7-bootstrap)[source]: Add patch. [inputs]: Remove arb. Change-Id: I06bac9d850977b8ee769e629f1b64411a8dc3247 --- gnu/local.mk | 3 ++- gnu/packages/lisp.scm | 10 +++++---- gnu/packages/patches/s7-flint-3.patch | 31 +++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/s7-flint-3.patch diff --git a/gnu/local.mk b/gnu/local.mk index 43d02ee793..9eac0cae1a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1,6 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2012-2024 Ludovic Courtès -# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023 Andreas Enge +# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023, 2024 Andreas Enge # Copyright © 2016 Mathieu Lirzin # Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver # Copyright © 2016 Chris Marusich @@ -2003,6 +2003,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-wl-clipboard-rs-newer-wl.patch \ %D%/packages/patches/rw-igraph-0.10.patch \ %D%/packages/patches/rxvt-unicode-fix-cursor-position.patch \ + %D%/packages/patches/s7-flint-3.patch \ %D%/packages/patches/sbc-fix-build-non-x86.patch \ %D%/packages/patches/sbcl-aserve-add-HTML-5-elements.patch \ %D%/packages/patches/sbcl-aserve-fix-rfe12668.patch \ diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 8e614b7d90..29d5ddebdc 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -25,7 +25,8 @@ ;;; Copyright © 2022 ( ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Yovan Naumovski -;;; Copyright © 2023 Andrew Kravchuk +;;; Copyright © 2024 Andreas Enge ;;; ;;; This file is part of GNU Guix. ;;; @@ -1502,7 +1503,8 @@ (define-public s7-bootstrap (file-name (git-file-name name version)) (sha256 (base32 - "0fiw8lb7rswglixvn271la2q2hgwszrf2ckykhr6jjxdvmb9a7d0")))) + "0fiw8lb7rswglixvn271la2q2hgwszrf2ckykhr6jjxdvmb9a7d0")) + (patches (search-patches "s7-flint-3.patch")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;no tests in bootstrap @@ -1533,7 +1535,7 @@ (define-public s7-bootstrap (invoke #$(cc-for-target) "libarb_s7.c" "-I." "-O2" "-g" "-shared" "-o" "libarb_s7.so" - "-larb" "-lflint" "-lmpc" "-fPIC") + "-lflint" "-lmpc" "-fPIC") (display "[BUILD] libnotcurses_s7.so\n") (invoke #$(cc-for-target) "notcurses_s7.c" "-I." "-O2" "-g" @@ -1572,7 +1574,7 @@ (define-public s7-bootstrap (install-file "s7.c" share) (install-file "s7.h" inc) (install-file "s7.html" doc))))))) - (inputs (list arb flint mpc notcurses)) + (inputs (list flint mpc notcurses)) (home-page "https://ccrma.stanford.edu/software/snd/snd/s7.html") (synopsis "Scheme interpreter intended as an extension language") (description diff --git a/gnu/packages/patches/s7-flint-3.patch b/gnu/packages/patches/s7-flint-3.patch new file mode 100644 index 0000000000..49f47adda1 --- /dev/null +++ b/gnu/packages/patches/s7-flint-3.patch @@ -0,0 +1,31 @@ +From bd54bd42c5933e4c571dcfd6a8afac8e52cf7366 Mon Sep 17 00:00:00 2001 +From: Andreas Enge +Date: Thu, 25 Jan 2024 12:13:18 +0100 +Subject: [PATCH] Adapt libarb_s7.c to FLINT 3. + +--- + libarb_s7.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libarb_s7.c b/libarb_s7.c +index 7413ccc..d9e0084 100644 +--- a/libarb_s7.c ++++ b/libarb_s7.c +@@ -6,10 +6,10 @@ + #include + #include + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + #define WITH_GMP 1 + #include "s7.h" +-- +2.41.0 + From patchwork Thu Jan 25 13:58:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 59383 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D981927BBEA; Thu, 25 Jan 2024 13:59:43 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BCBF327BBE2 for ; Thu, 25 Jan 2024 13:59:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT0G0-00028P-KA; Thu, 25 Jan 2024 08:59:04 -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 ) id 1rT0Fv-00027L-DS for guix-patches@gnu.org; Thu, 25 Jan 2024 08:58:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT0Ft-0007R9-G6 for guix-patches@gnu.org; Thu, 25 Jan 2024 08:58:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rT0Fy-0000lH-Ol; Thu, 25 Jan 2024 08:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68714] [PATCH 4/5] gnu: python-flint: Update to 0.5.0 and build with flint@3. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68714 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68714@debbugs.gnu.org Cc: Andreas Enge , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 68714-submit@debbugs.gnu.org id=B68714.17061911212871 (code B ref 68714); Thu, 25 Jan 2024 13:59:02 +0000 Received: (at 68714) by debbugs.gnu.org; 25 Jan 2024 13:58:41 +0000 Received: from localhost ([127.0.0.1]:47638 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT0Fd-0000k9-65 for submit@debbugs.gnu.org; Thu, 25 Jan 2024 08:58:41 -0500 Received: from hera.aquilenet.fr ([185.233.100.1]:33848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT0FX-0000jM-5n for 68714@debbugs.gnu.org; Thu, 25 Jan 2024 08:58:36 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id B914F115A; Thu, 25 Jan 2024 14:58:23 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8XEUgzxexmKc; Thu, 25 Jan 2024 14:58:22 +0100 (CET) Received: from jurong.math.u-bordeaux1.fr (sauterelleold.math.u-bordeaux1.fr [147.210.16.130]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 746B2348; Thu, 25 Jan 2024 14:58:22 +0100 (CET) From: Andreas Enge Date: Thu, 25 Jan 2024 14:58:05 +0100 Message-ID: <0ca0558168755c0d604e85cf4225691f4805ac30.1706190861.git.andreas@enge.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/python-flint-includes.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Unregister file. * gnu/packages/algebra.scm (python-flint): Update to 0.5.0. [source]: Drop patch. [inputs]: Drop arb. [native-inputs]: Use python-cython-3. Change-Id: I5fa9b201efff76e16f957aee0ebcd453ea823e69 --- gnu/local.mk | 1 - gnu/packages/algebra.scm | 9 +- .../patches/python-flint-includes.patch | 131 ------------------ 3 files changed, 4 insertions(+), 137 deletions(-) delete mode 100644 gnu/packages/patches/python-flint-includes.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9eac0cae1a..ab63bd5881 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1910,7 +1910,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-piexif-fix-tests-with-pillow-7.2.patch \ %D%/packages/patches/python-pillow-CVE-2022-45199.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ - %D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-memcached-syntax-warnings.patch \ %D%/packages/patches/python-mox3-python3.6-compat.patch \ diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 43047a9b32..5fd8d0f106 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -494,7 +494,7 @@ (define-public arb (define-public python-flint (package (name "python-flint") - (version "0.3.0") + (version "0.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -503,15 +503,14 @@ (define-public python-flint (file-name (git-file-name name version)) (sha256 (base32 - "1v0anazbj1cfi68nl2j6dbd31kgkc1563xmr0zk5xk3xj78569pw")) - (patches (search-patches "python-flint-includes.patch")))) + "10370kqik6q6vdqrqv3gbznsyaxbgqb3rbrff4alpw0sqr5s07c7")))) (build-system python-build-system) (native-inputs - (list python-cython)) + (list python-cython-3)) (propagated-inputs (list python-numpy)) (inputs - (list arb flint)) + (list flint)) (synopsis "Python module wrapping ARB and FLINT") (description "Python-flint is a Python extension module wrapping FLINT diff --git a/gnu/packages/patches/python-flint-includes.patch b/gnu/packages/patches/python-flint-includes.patch deleted file mode 100644 index c0cfe94a04..0000000000 --- a/gnu/packages/patches/python-flint-includes.patch +++ /dev/null @@ -1,131 +0,0 @@ -The following patch, authored by Andreas Enge, looks for the flint include -files in the correct subdirectory. - -diff -u -r python-flint-old/src/flint.pxd python-flint-new/src/flint.pxd ---- python-flint-old/src/flint.pxd 2019-03-19 10:26:11.055748626 +0100 -+++ python-flint-new/src/flint.pxd 2019-03-19 10:35:23.269341203 +0100 -@@ -27,7 +27,7 @@ - - ctypedef long fmpz_struct - --cdef extern from "flint.h": -+cdef extern from "flint/flint.h": - ctypedef void * flint_rand_t - void flint_randinit(flint_rand_t state) - void flint_randclear(flint_rand_t state) -@@ -35,7 +35,7 @@ - long flint_get_num_threads() - void flint_cleanup() - --cdef extern from "nmod_vec.h": -+cdef extern from "flint/nmod_vec.h": - ctypedef struct nmod_t: - mp_limb_t n - mp_limb_t ninv -@@ -47,7 +47,7 @@ - mp_limb_t nmod_mul(mp_limb_t a, mp_limb_t b, nmod_t mod) - mp_limb_t nmod_div(mp_limb_t a, mp_limb_t b, nmod_t mod) - --cdef extern from "nmod_poly.h": -+cdef extern from "flint/nmod_poly.h": - ctypedef struct nmod_poly_struct: - mp_ptr coeffs - long alloc -@@ -129,7 +129,7 @@ - void nmod_poly_factor_init(nmod_poly_factor_t fac) - void nmod_poly_factor_clear(nmod_poly_factor_t fac) - --cdef extern from "nmod_mat.h": -+cdef extern from "flint/nmod_mat.h": - ctypedef struct nmod_mat_struct: - mp_limb_t * entries - long r -@@ -178,7 +178,7 @@ - long nmod_mat_rref(nmod_mat_t A) - long nmod_mat_nullspace(nmod_mat_t X, nmod_mat_t A) - --cdef extern from "fmpz.h": -+cdef extern from "flint/fmpz.h": - ctypedef fmpz_struct fmpz_t[1] - int COEFF_IS_MPZ(fmpz_struct v) - void fmpz_init(fmpz_t op) -@@ -268,7 +268,7 @@ - void fmpz_rfac_uiui(fmpz_t r, ulong x, ulong n) - void fmpz_primorial(fmpz_t res, ulong n) - --cdef extern from "fmpz_factor.h": -+cdef extern from "flint/fmpz_factor.h": - ctypedef struct fmpz_factor_struct: - int sign - fmpz_struct * p -@@ -280,7 +280,7 @@ - void fmpz_factor_clear(fmpz_factor_t factor) - void fmpz_factor(fmpz_factor_t factor, fmpz_t n) - --cdef extern from "fmpz_poly.h": -+cdef extern from "flint/fmpz_poly.h": - ctypedef struct fmpz_poly_struct: - fmpz_struct * coeffs - long alloc -@@ -390,14 +390,14 @@ - void fmpz_poly_cos_minpoly(fmpz_poly_t, ulong) - void fmpz_poly_swinnerton_dyer(fmpz_poly_t, ulong) - --cdef extern from "fmpz_poly_factor.h": -+cdef extern from "flint/fmpz_poly_factor.h": - void fmpz_poly_factor_init(fmpz_poly_factor_t fac) - void fmpz_poly_factor_clear(fmpz_poly_factor_t fac) - void fmpz_poly_factor_zassenhaus(fmpz_poly_factor_t fac, fmpz_poly_t G) - void fmpz_poly_factor(fmpz_poly_factor_t fac, fmpz_poly_t G) - void fmpz_poly_factor_squarefree(fmpz_poly_factor_t fac, fmpz_poly_t G) - --cdef extern from "fmpz_mat.h": -+cdef extern from "flint/fmpz_mat.h": - ctypedef struct fmpz_mat_struct: - fmpz_struct * entries - long r -@@ -448,7 +448,7 @@ - void fmpz_mat_snf(fmpz_mat_t S, const fmpz_mat_t A) - int fmpz_mat_is_in_snf(const fmpz_mat_t A) - --cdef extern from "fmpz_lll.h": -+cdef extern from "flint/fmpz_lll.h": - ctypedef struct fmpz_lll_struct: - double delta - double eta -@@ -461,7 +461,7 @@ - void fmpz_lll(fmpz_mat_t B, fmpz_mat_t U, const fmpz_lll_t fl) - - --cdef extern from "fmpq.h": -+cdef extern from "flint/fmpq.h": - ctypedef struct fmpq_struct: - fmpz_struct num - fmpz_struct den -@@ -506,7 +506,7 @@ - void fmpq_next_signed_minimal(fmpq_t res, fmpq_t x) - void fmpq_harmonic_ui(fmpq_t res, ulong n) - --cdef extern from "fmpq_poly.h": -+cdef extern from "flint/fmpq_poly.h": - ctypedef struct fmpq_poly_struct: - fmpz_struct * coeffs - fmpz_t den -@@ -620,7 +620,7 @@ - void fmpq_poly_compose_series(fmpq_poly_t res, fmpq_poly_t poly1, fmpq_poly_t poly2, long n) - void fmpq_poly_revert_series(fmpq_poly_t res, fmpq_poly_t poly1, long n) - --cdef extern from "fmpq_mat.h": -+cdef extern from "flint/fmpq_mat.h": - ctypedef struct fmpq_mat_struct: - fmpq_struct * entries - long r -@@ -672,7 +672,7 @@ - long fmpq_mat_rref(fmpq_mat_t B, fmpq_mat_t A) - void fmpq_mat_transpose(fmpq_mat_t B, fmpq_mat_t A) - --cdef extern from "arith.h": -+cdef extern from "flint/arith.h": - void arith_number_of_partitions(fmpz_t res, ulong n) - int arith_moebius_mu(fmpz_t n) - void arith_divisor_sigma(fmpz_t v, fmpz_t n, ulong k) From patchwork Thu Jan 25 13:58:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 59382 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9E8BB27BBE9; Thu, 25 Jan 2024 13:59:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A85C127BBE2 for ; Thu, 25 Jan 2024 13:59:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT0G0-00028Q-KG; Thu, 25 Jan 2024 08:59:04 -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 ) id 1rT0Fv-00027K-CU for guix-patches@gnu.org; Thu, 25 Jan 2024 08:58:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rT0Ft-0007R8-Fh for guix-patches@gnu.org; Thu, 25 Jan 2024 08:58:59 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rT0Fz-0000lR-8I; Thu, 25 Jan 2024 08:59:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68714] [PATCH 5/5] gnu: arb: Deprecate package. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 13:59:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68714 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68714@debbugs.gnu.org Cc: Andreas Enge , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 68714-submit@debbugs.gnu.org id=B68714.17061911222879 (code B ref 68714); Thu, 25 Jan 2024 13:59:03 +0000 Received: (at 68714) by debbugs.gnu.org; 25 Jan 2024 13:58:42 +0000 Received: from localhost ([127.0.0.1]:47640 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT0Fd-0000kG-Qq for submit@debbugs.gnu.org; Thu, 25 Jan 2024 08:58:42 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]:58886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT0FX-0000jN-Hn for 68714@debbugs.gnu.org; Thu, 25 Jan 2024 08:58:37 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 29372348; Thu, 25 Jan 2024 14:58:24 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tT1H3nm4OgIr; Thu, 25 Jan 2024 14:58:23 +0100 (CET) Received: from jurong.math.u-bordeaux1.fr (sauterelleold.math.u-bordeaux1.fr [147.210.16.130]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 2AB0E1149; Thu, 25 Jan 2024 14:58:23 +0100 (CET) From: Andreas Enge Date: Thu, 25 Jan 2024 14:58:06 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/algebra.scm (arb): Deprecate in favor of flint, of which it is now a part. Change-Id: I02ee2110e77c582b8daf70502f7092eba7c44547 --- gnu/packages/algebra.scm | 42 +--------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 5fd8d0f106..667a5f1a38 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -449,47 +449,7 @@ (define-public flint '((release-monitoring-url . "http://flintlib.org/downloads.html"))))) (define-public arb - (package - (name "arb") - (version "2.23.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/fredrik-johansson/arb") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1m9vskyf857gbm0cbh3z8c8m6cqkqa765wb9hqmsv7yzfmklzpvn")))) - (build-system gnu-build-system) - (propagated-inputs - (list flint)) ; flint.h is included by arf.h - (inputs - (list gmp mpfr)) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (flint (assoc-ref inputs "flint")) - (gmp (assoc-ref inputs "gmp")) - (mpfr (assoc-ref inputs "mpfr"))) - ;; Do not pass "--enable-fast-install", which makes the - ;; homebrew configure process fail. - (invoke "./configure" - (string-append "--prefix=" out) - (string-append "--with-flint=" flint) - (string-append "--with-gmp=" gmp) - (string-append "--with-mpfr=" mpfr)))))))) - (home-page "https://arblib.org") - (synopsis "Arbitrary precision floating-point ball arithmetic") - (description - "Arb is a C library for arbitrary-precision floating-point ball -arithmetic. It supports efficient high-precision computation with -polynomials, power series, matrices and special functions over the -real and complex numbers, with automatic, rigorous error control.") - (license license:lgpl2.1+))) + (deprecated-package "arb" flint)) (define-public python-flint (package