Package: guix-patches;
Reported by: Andreas Enge <andreas <at> enge.fr>
Date: Thu, 25 Jan 2024 13:57:02 UTC
Severity: normal
Tags: patch
Done: Andreas Enge <andreas <at> enge.fr>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68714 in the body.
You can then email your comments to 68714 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
andreas <at> enge.fr, bavier <at> posteo.net, sharlatanus <at> gmail.com, guix-patches <at> gnu.org:bug#68714; Package guix-patches.
(Thu, 25 Jan 2024 13:57:02 GMT) Full text and rfc822 format available.Andreas Enge <andreas <at> enge.fr>:andreas <at> enge.fr, bavier <at> posteo.net, sharlatanus <at> gmail.com, guix-patches <at> gnu.org.
(Thu, 25 Jan 2024 13:57:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Andreas Enge <andreas <at> enge.fr> To: guix-patches <at> gnu.org Cc: Andreas Enge <andreas <at> enge.fr> Subject: [PATCH 0/5] Update flint to 3.0.1 Date: Thu, 25 Jan 2024 14:54:31 +0100
This patch series updates flint to 3.0.1, removes arb, which has been moved into the flint library, and deals with the dependent packages. Andreas Enge (5): gnu: flint: Update to 3.0.1. gnu: pynac: Remove package. gnu: s7: Compile with flint <at> 3. gnu: python-flint: Update to 0.5.0 and build with flint <at> 3. gnu: arb: Deprecate package. gnu/local.mk | 4 +- gnu/packages/algebra.scm | 80 ++--------- gnu/packages/lisp.scm | 10 +- .../patches/python-flint-includes.patch | 131 ------------------ gnu/packages/patches/s7-flint-3.patch | 31 +++++ gnu/packages/sagemath.scm | 29 +--- 6 files changed, 49 insertions(+), 236 deletions(-) delete mode 100644 gnu/packages/patches/python-flint-includes.patch create mode 100644 gnu/packages/patches/s7-flint-3.patch base-commit: 5111915e6afeb507a73a6ebe60e3fef754a3016a -- 2.41.0
guix-patches <at> gnu.org:bug#68714; Package guix-patches.
(Thu, 25 Jan 2024 13:59:01 GMT) Full text and rfc822 format available.Message #8 received at 68714 <at> debbugs.gnu.org (full text, mbox):
From: Andreas Enge <andreas <at> enge.fr> To: 68714 <at> debbugs.gnu.org Cc: Andreas Enge <andreas <at> enge.fr> Subject: [PATCH 2/5] gnu: pynac: Remove package. Date: Thu, 25 Jan 2024 14:58:03 +0100
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 <andreas <at> enge.fr>
+;;; Copyright © 2019 Andreas Enge <andreas <at> enge.fr>
;;; Copyright © 2019 Nicolas Goaziou <mail <at> nicolasgoaziou.fr>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me <at> tobias.gr>
;;; Copyright © 2020 Jakub Kądziołka <kuba <at> kadziolka.net>
@@ -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
--
2.41.0
andreas <at> enge.fr, bavier <at> posteo.net, sharlatanus <at> gmail.com, guix-patches <at> gnu.org:bug#68714; Package guix-patches.
(Thu, 25 Jan 2024 13:59:02 GMT) Full text and rfc822 format available.Message #11 received at 68714 <at> debbugs.gnu.org (full text, mbox):
From: Andreas Enge <andreas <at> enge.fr> To: 68714 <at> debbugs.gnu.org Cc: Andreas Enge <andreas <at> enge.fr> Subject: [PATCH 1/5] gnu: flint: Update to 3.0.1. Date: Thu, 25 Jan 2024 14:58:02 +0100
* 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
--
2.41.0
andreas <at> enge.fr, bavier <at> posteo.net, sharlatanus <at> gmail.com, guix-patches <at> gnu.org:bug#68714; Package guix-patches.
(Thu, 25 Jan 2024 13:59:02 GMT) Full text and rfc822 format available.Message #14 received at 68714 <at> debbugs.gnu.org (full text, mbox):
From: Andreas Enge <andreas <at> enge.fr> To: 68714 <at> debbugs.gnu.org Cc: Andreas Enge <andreas <at> enge.fr> Subject: [PATCH 4/5] gnu: python-flint: Update to 0.5.0 and build with flint <at> 3. Date: Thu, 25 Jan 2024 14:58:05 +0100
* 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)
--
2.41.0
andreas <at> enge.fr, bavier <at> posteo.net, sharlatanus <at> gmail.com, guix-patches <at> gnu.org:bug#68714; Package guix-patches.
(Thu, 25 Jan 2024 13:59:03 GMT) Full text and rfc822 format available.Message #17 received at 68714 <at> debbugs.gnu.org (full text, mbox):
From: Andreas Enge <andreas <at> enge.fr> To: 68714 <at> debbugs.gnu.org Cc: Andreas Enge <andreas <at> enge.fr> Subject: [PATCH 5/5] gnu: arb: Deprecate package. Date: Thu, 25 Jan 2024 14:58:06 +0100
* 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
--
2.41.0
glv <at> posteo.net, cox.katherine.e+guix <at> gmail.com, me <at> bonfacemunyoki.com, sharlatanus <at> gmail.com, jgart <at> dismail.de, guix-patches <at> gnu.org:bug#68714; Package guix-patches.
(Thu, 25 Jan 2024 13:59:03 GMT) Full text and rfc822 format available.Message #20 received at 68714 <at> debbugs.gnu.org (full text, mbox):
From: Andreas Enge <andreas <at> enge.fr> To: 68714 <at> debbugs.gnu.org Cc: Andreas Enge <andreas <at> enge.fr> Subject: [PATCH 3/5] gnu: s7: Compile with flint <at> 3. Date: Thu, 25 Jan 2024 14:58:04 +0100
* 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 <ludo <at> gnu.org>
-# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023 Andreas Enge <andreas <at> enge.fr>
+# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2022, 2023, 2024 Andreas Enge <andreas <at> enge.fr>
# Copyright © 2016 Mathieu Lirzin <mthl <at> gnu.org>
# Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Mark H Weaver <mhw <at> netris.org>
# Copyright © 2016 Chris Marusich <cmmarusich <at> gmail.com>
@@ -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 ( <paren <at> disroot.org>
;;; Copyright © 2023 Zheng Junjie <873216071 <at> qq.com>
;;; Copyright © 2023 Yovan Naumovski <yovan <at> gorski.stream>
-;;; Copyright © 2023 Andrew Kravchuk <awkravchuk <at> gmail.com.
+;;; Copyright © 2023 Andrew Kravchuk <awkravchuk <at> gmail.com>
+;;; Copyright © 2024 Andreas Enge <andreas <at> enge.fr>
;;;
;;; 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 <andreas <at> enge.fr>
+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 <mpfr.h>
+ #include <mpc.h>
+
+-#include <arb.h>
+-#include <acb.h>
+-#include <acb_hypgeom.h>
+-#include <acb_elliptic.h>
++#include <flint/arb.h>
++#include <flint/acb.h>
++#include <flint/acb_hypgeom.h>
++#include <flint/acb_elliptic.h>
+
+ #define WITH_GMP 1
+ #include "s7.h"
+--
+2.41.0
+
--
2.41.0
guix-patches <at> gnu.org:bug#68714; Package guix-patches.
(Thu, 25 Jan 2024 16:15:05 GMT) Full text and rfc822 format available.Message #23 received at 68714 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: 68714 <at> debbugs.gnu.org Subject: [PATCH 1/4] gnu: Add python-clingo-dl. Date: Thu, 25 Jan 2024 10:42:06 +0100
* gnu/packages/potassco.scm (python-clingo-dl): New variable.
---
gnu/packages/potassco.scm | 36 +++++++++++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm
index f2ee27db99..afc4c4d513 100644
--- a/gnu/packages/potassco.scm
+++ b/gnu/packages/potassco.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2022, 2023 Liliana Marie Prikler <liliana.prikler <at> gmail.com>
+;;; Copyright © 2022–2024 Liliana Marie Prikler <liliana.prikler <at> gmail.com>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune <at> gmail.com>
;;; Copyright © 2023 David Elsing <david.elsing <at> posteo.net>
;;; Copyright © 2024 Ricardo Wurmus <rekado <at> elephly.net>
@@ -370,6 +370,40 @@ (define-public python-clingo
making it so that you can write @acronym{ASPs, Answer Set Programs} through
Python code.")))
+(define-public python-clingo-dl
+ (package
+ (inherit clingo-dl)
+ (name "python-clingo-dl")
+ (version (package-version clingo-dl))
+ (arguments
+ (list
+ #:configure-flags #~'("-DPYCLINGODL_ENABLE=pip")
+ #:tests? #f
+ #:imported-modules `(,@%cmake-build-system-modules
+ (guix build python-build-system))
+ #:modules '((guix build cmake-build-system)
+ ((guix build python-build-system) #:prefix python:)
+ (guix build utils))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'install-distinfo
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (with-directory-excursion (python:site-packages inputs outputs)
+ (let ((dir (string-append "clingodl-" #$version ".dist-info")))
+ (mkdir-p dir)
+ (call-with-output-file (string-append dir "/METADATA")
+ (lambda (port)
+ (format port "Metadata-Version: 1.1~%")
+ (format port "Name: clingodl~%")
+ (format port "Version: ~a~%" #$version))))))))))
+ (inputs (modify-inputs (package-inputs clingo-dl)
+ (prepend python-wrapper)))
+ (propagated-inputs (list python-clingo python-cffi))
+ (synopsis "Python bindings for clingo-dl")
+ (description "This package allows users to add the clingo-dl propagator
+as a theory to clingo from Python code. It also supports running clingo-dl
+directly from the python command line.")))
+
(define-public python-clorm
(package
(name "python-clorm")
--
2.41.0
guix-patches <at> gnu.org:bug#68714; Package guix-patches.
(Thu, 25 Jan 2024 16:15:05 GMT) Full text and rfc822 format available.Message #26 received at 68714 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: 68714 <at> debbugs.gnu.org Subject: [PATCH 2/4] gnu: python-clorm: Reindent with emacs. Date: Thu, 25 Jan 2024 10:44:44 +0100
* gnu/packages/potassco.scm (python-clorm): Reindent with emacs.
---
gnu/packages/potassco.scm | 58 +++++++++++++++++++--------------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm
index afc4c4d513..0ec6253099 100644
--- a/gnu/packages/potassco.scm
+++ b/gnu/packages/potassco.scm
@@ -406,38 +406,38 @@ (define-public python-clingo-dl
(define-public python-clorm
(package
- (name "python-clorm")
- (version "1.4.1")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/potassco/clorm")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0jx99y71mrgdicn1da5dwz5nzgvvpabrikff783sg4shbv2cf0b5"))))
- (build-system pyproject-build-system)
- (arguments
- (list #:phases
- #~(modify-phases %standard-phases
- (add-before 'check 'fix-breaking-tests
- (lambda _
- ;; noclingo tests rely on this being set
- (setenv "CLORM_NOCLINGO" "1")
- (delete-file "tests/test_mypy_query.py")
- (substitute* "tests/test_clingo.py"
- (("self\\.assertTrue\\(os_called\\)" all)
- (string-append "# " all))))))))
- (propagated-inputs (list python-clingo))
- (native-inputs (list python-typing-extensions))
- (home-page "https://potassco.org")
- (synopsis "Object relational mapping to clingo")
- (description "@acronym{Clorm, Clingo ORM} provides an @acronym{ORM,
+ (name "python-clorm")
+ (version "1.4.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/potassco/clorm")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0jx99y71mrgdicn1da5dwz5nzgvvpabrikff783sg4shbv2cf0b5"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'check 'fix-breaking-tests
+ (lambda _
+ ;; noclingo tests rely on this being set
+ (setenv "CLORM_NOCLINGO" "1")
+ (delete-file "tests/test_mypy_query.py")
+ (substitute* "tests/test_clingo.py"
+ (("self\\.assertTrue\\(os_called\\)" all)
+ (string-append "# " all))))))))
+ (propagated-inputs (list python-clingo))
+ (native-inputs (list python-typing-extensions))
+ (home-page "https://potassco.org")
+ (synopsis "Object relational mapping to clingo")
+ (description "@acronym{Clorm, Clingo ORM} provides an @acronym{ORM,
Object Relational Mapping} interface to the @acronym{ASP, answer set
programming} solver clingo. Its goal is to make integration of clingo
into Python programs easier.")
- (license license:expat)))
+ (license license:expat)))
(define-public python-telingo
(package
--
2.41.0
guix-patches <at> gnu.org:bug#68714; Package guix-patches.
(Thu, 25 Jan 2024 16:15:06 GMT) Full text and rfc822 format available.Message #29 received at 68714 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: 68714 <at> debbugs.gnu.org Subject: [PATCH 3/4] gnu: Add python-plingo. Date: Thu, 25 Jan 2024 10:46:07 +0100
* gnu/packages/potassco.scm (python-plingo): New variable.
---
gnu/packages/potassco.scm | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm
index 0ec6253099..81d7cfa7e2 100644
--- a/gnu/packages/potassco.scm
+++ b/gnu/packages/potassco.scm
@@ -439,6 +439,44 @@ (define-public python-clorm
into Python programs easier.")
(license license:expat)))
+(define-public python-plingo
+ (package
+ (name "python-plingo")
+ (version "1.0.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/potassco/plingo")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1mp0pdjzwpl7bpba20iwszx9x49gsyl2rhrp7w7xpwjqdjrp23r8"))))
+ (build-system pyproject-build-system)
+ (arguments
+ (list #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'install 'install-script
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((script (string-append (assoc-ref outputs "out")
+ "/bin/plingo")))
+ (mkdir-p (dirname script))
+ (call-with-output-file script
+ (lambda (port)
+ (display "#!/usr/bin/env python\n" port)
+ (display "from plingo import main\n" port)
+ (display "main()\n" port)))
+ (chmod script #o755)
+ ;; XXX: Does this cross-compile?
+ (patch-shebang script)))))))
+ (propagated-inputs (list python-clingo))
+ (home-page "https://potassco.org/")
+ (synopsis "Solve probabilistic logic programs")
+ (description "This package provides a system to solve probabilistic
+logic programs with clingo. It can solve the reasoning tasks of finding
+the most probable model as well as finding all models and their probabilities.")
+ (license license:expat)))
+
(define-public python-telingo
(package
(name "python-telingo")
--
2.41.0
guix-patches <at> gnu.org:bug#68714; Package guix-patches.
(Thu, 25 Jan 2024 22:28:01 GMT) Full text and rfc822 format available.Message #32 received at 68714 <at> debbugs.gnu.org (full text, mbox):
From: Sharlatan Hellseher <sharlatanus <at> gmail.com> To: 68714 <at> debbugs.gnu.org Cc: liliana.prikler <at> gmail.com Subject: [PATCH 0/5] Update flint to 3.0.1 Date: Thu, 25 Jan 2024 22:27:02 +0000
[Message part 1 (text/plain, inline)]
Hi Liliana, Was your patch series sent by mistake to this issue :-)? I see this one is open without patches: [PATCH 0/4] More clingo stuff. https://issues.guix.gnu.org/68713 Thanks, Oleg
[signature.asc (application/pgp-signature, inline)]
guix-patches <at> gnu.org:bug#68714; Package guix-patches.
(Fri, 26 Jan 2024 05:22:01 GMT) Full text and rfc822 format available.Message #35 received at 68714 <at> debbugs.gnu.org (full text, mbox):
From: Liliana Marie Prikler <liliana.prikler <at> gmail.com> To: Sharlatan Hellseher <sharlatanus <at> gmail.com>, 68714 <at> debbugs.gnu.org Subject: Re: [PATCH 0/5] Update flint to 3.0.1 Date: Fri, 26 Jan 2024 06:21:17 +0100
Am Donnerstag, dem 25.01.2024 um 22:27 +0000 schrieb Sharlatan Hellseher: > > Hi Liliana, > > Was your patch series sent by mistake to this issue :-)? > > I see this one is open without patches: > > [PATCH 0/4] More clingo stuff. > https://issues.guix.gnu.org/68713 > > Thanks, > Oleg Yes, sorry. To unconfuse CI, if it's currently confused, you might want to send your v1 as v2. Cheers
Andreas Enge <andreas <at> enge.fr>:Andreas Enge <andreas <at> enge.fr>:Message #40 received at 68714-done <at> debbugs.gnu.org (full text, mbox):
From: Andreas Enge <andreas <at> enge.fr> To: 68714-done <at> debbugs.gnu.org Subject: Done Date: Fri, 26 Jan 2024 10:24:37 +0100
Merged. Andreas
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Fri, 23 Feb 2024 12:24:10 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.