From patchwork Mon Mar 6 20:17:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Enge X-Patchwork-Id: 47751 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 1FE0B16D8D; Mon, 6 Mar 2023 20:18:17 +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=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 E999C16D6E for ; Mon, 6 Mar 2023 20:18:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZHHY-00047g-UU; Mon, 06 Mar 2023 15:18: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 1pZHHX-00047L-Al for guix-patches@gnu.org; Mon, 06 Mar 2023 15:18:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZHHX-0002Qe-2z for guix-patches@gnu.org; Mon, 06 Mar 2023 15:18:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pZHHV-0002mn-NV; Mon, 06 Mar 2023 15:18:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62011] [PATCH] gnu: gap: Update to 4.12.2. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Mon, 06 Mar 2023 20:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62011 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62011@debbugs.gnu.org Cc: Andreas Enge , efraim@flashner.co.il bavier@posteo.net X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: efraim@flashner.co.il bavier@posteo.net Received: via spool by submit@debbugs.gnu.org id=B.167813387910698 (code B ref -1); Mon, 06 Mar 2023 20:18:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Mar 2023 20:17:59 +0000 Received: from localhost ([127.0.0.1]:43778 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZHHS-0002mR-Tc for submit@debbugs.gnu.org; Mon, 06 Mar 2023 15:17:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:39276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pZHHQ-0002mH-1K for submit@debbugs.gnu.org; Mon, 06 Mar 2023 15:17:56 -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 1pZHHP-00046K-Qg for guix-patches@gnu.org; Mon, 06 Mar 2023 15:17:55 -0500 Received: from hera.aquilenet.fr ([2a0c:e300::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pZHHM-0002CF-M2 for guix-patches@gnu.org; Mon, 06 Mar 2023 15:17:55 -0500 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id F3E631C02; Mon, 6 Mar 2023 21:17:44 +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 LWCn8pAzgb3r; Mon, 6 Mar 2023 21:17:44 +0100 (CET) Received: from jurong.lan (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id ED81F63D; Mon, 6 Mar 2023 21:17:43 +0100 (CET) From: Andreas Enge Date: Mon, 6 Mar 2023 21:17:26 +0100 Message-Id: <839c6697f686bc73cf007d9a344f6bf6b02cf5a8.1678133820.git.andreas@enge.fr> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Received-SPF: pass client-ip=2a0c:e300::1; envelope-from=andreas@enge.fr; helo=hera.aquilenet.fr X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 (gap): Update to 4.12.2. [snippet]: Delete only bundled libraries inside hpcgap instead of the complete subdirectory. Update package names and add new packages. [arguments]: Use "make install" and a phase to install packages. --- gnu/packages/algebra.scm | 134 ++++++++++++++++++--------------------- 1 file changed, 62 insertions(+), 72 deletions(-) base-commit: fd4545a47a527fff437abb9991156cfee4137d2b diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index c3414a3f57..5842a166ad 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1257,7 +1257,7 @@ (define-public xtensor-benchmark (define-public gap (package (name "gap") - (version "4.11.1") + (version "4.12.2") (source (origin (method url-fetch) @@ -1267,14 +1267,13 @@ (define-public gap version ".tar.gz")) (sha256 - (base32 "01535s81h254zcs84zi95xqmhvvn6fn9qss8761myxc2gpdcadb6")) + (base32 "1a47slldnjq6mib69k3g8lqw6nyxdrwdd3gfjhj252mpbrs0h8v7")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet '(begin - ;; Delete the external gmp and zlib libraries - ;; and a subdirectory not needed for our build. + ;; Delete bundled external libraries. (for-each delete-file-recursively - '("extern" "hpcgap")) + '("extern" "hpcgap/extern")) ;; Delete a failing test. ;; FIXME: This might be fixed in the next release, see ;; https://github.com/gap-system/gap/issues/3292 @@ -1288,47 +1287,69 @@ (define-public gap (scandir ".") '("." ".." ;; Necessary packages. - "GAPDoc-" - "primgrp-" - "SmallGrp-" ; artistic2.0 - "transgrp" ; artistic2.0 for data, - ; gpl2 or gpl3 for code + "gapdoc" + "primgrp" + "smallgrp" ; artistic2.0 + "transgrp" ; artistic2.0 for data, + ; gpl2 or gpl3 for code ;; Optional packages. - "alnuth-" - "AutoDoc-" - "automata-" - "autpgrp-" - "crime-" - "crisp-" ; bsd-2 - "ctbllib" ; gpl3+ + "4ti2interface" + "alnuth" + "autodoc" + "automata" + "autpgrp" + "cap" + "crime" + "crisp" ; bsd-2 + "ctbllib" ; gpl3+ "datastructures" - "FactInt-" + "examplesforhomalg" + "factint" "fga" "format" - "groupoids-" + "gauss" + "gaussforhomalg" + "generalizedmorphismsforcap" + "gradedmodules" + "gradedringforhomalg" + "groupoids" "guarana" - "idrel-" - "images-" ; mpl2.0 - "IntPic-" - "io-" ; gpl3+ - "irredsol-" ; bsd-2 - "laguna-" - "liering-" - "MapClass-" - "nilmat-" - "NumericalSgps-" - "OpenMath-" - "orb-" ; gpl3+ - "polenta-" - "polycyclic-" - "radiroot-" - "repsn-" - "resclasses-" + "homalg" + "homalgtocas" + "idrel" + "images" ; mpl2.0 + "intpic" + "io" ; gpl3+ + "ioforhomalg" + "irredsol" ; bsd-2 + "laguna" + "liering" + "linearalgebraforcap" + "localizeringforhomalg" + "mapclass" + "matricesforhomalg" + "modulepresentationsforcap" + "modules" + "monoidalcategories" + "nconvex" + "nilmat" + "numericalsgps" + "openmath" + "orb" ; gpl3+ + "polenta" + "polycyclic" + "radiroot" + "recog" ; gpl3+ + "repsn" + "resclasses" + "ringsforhomalg" + "sco" "simpcomp" - "sophus-" - "tomlib-" - "unipot-" - "utils-")))))))) + "sophus" + "tomlib" + "toolsforhomalg" + "unipot" + "utils")))))))) (build-system gnu-build-system) (inputs (list gmp readline zlib)) @@ -1351,41 +1372,10 @@ (define-public gap (lambda _ (with-directory-excursion "doc" (invoke "./make_doc")))) - (replace 'install + (add-after 'install 'install-packages (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (prog (string-append bin "/gap")) - (prog-real (string-append bin "/.gap-real")) (share (string-append out "/share/gap"))) - ;; Install only the gap binary; the gac compiler is left - ;; for maybe later. "Wrap" it in a shell script that calls - ;; the binary with the correct parameter. - ;; The make target install-bin is supposed to do that, but - ;; is not currently working. - (mkdir-p bin) - (copy-file "gap" prog-real) - (call-with-output-file prog - (lambda (port) - (format port - "#!~a~%exec ~a -l ~a \"$@\"~%" - (which "bash") - prog-real - share))) - (chmod prog #o755) - ;; Install the headers and library, which are needed by Sage. - (invoke "make" "install-headers") - (install-file "gen/config.h" - (string-append out "/include/gap")) - (invoke "make" "install-libgap") - ;; Remove information on the build directory from sysinfo.gap. - (substitute* "sysinfo.gap" - (("GAP_BIN_DIR=\".*\"") "GAP_BIN_DIR=\"\"") - (("GAP_LIB_DIR=\".*\"") "GAP_LIB_DIR=\"\"") - (("GAP_CPPFLAGS=\".*\"") "GAP_CPPFLAGS=\"\"")) - (invoke "make" "install-gaproot") - ;; Copy the directory of compiled packages; the make target - ;; install-pkg is currently empty. (copy-recursively "pkg" (string-append share "/pkg")))))))) (home-page "https://www.gap-system.org/") (synopsis