From patchwork Mon Aug 8 15:45:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vicvbcun X-Patchwork-Id: 41391 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 B451627BBEA; Mon, 8 Aug 2022 16:49:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 F3C9B27BBE9 for ; Mon, 8 Aug 2022 16:49:06 +0100 (BST) Received: from localhost ([::1]:50606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oL506-0002BB-47 for patchwork@mira.cbaines.net; Mon, 08 Aug 2022 11:49:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oL4zJ-0000iL-85 for guix-patches@gnu.org; Mon, 08 Aug 2022 11:48:20 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52028) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oL4zI-0006qK-QR for guix-patches@gnu.org; Mon, 08 Aug 2022 11:48:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oL4zI-0006CI-NT for guix-patches@gnu.org; Mon, 08 Aug 2022 11:48:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56729] [RFC PATCH v2 03/29] gnu: gap: Update to 4.11.1. Resent-From: vicvbcun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Aug 2022 15:48:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56729@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Andreas Enge Received: via spool by 56729-submit@debbugs.gnu.org id=B56729.165997368723646 (code B ref 56729); Mon, 08 Aug 2022 15:48:16 +0000 Received: (at 56729) by debbugs.gnu.org; 8 Aug 2022 15:48:07 +0000 Received: from localhost ([127.0.0.1]:41756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4z8-00068y-E0 for submit@debbugs.gnu.org; Mon, 08 Aug 2022 11:48:07 -0400 Received: from mo4-p05-ob.smtp.rzone.de ([85.215.255.136]:45857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4yb-00062k-OI for 56729@debbugs.gnu.org; Mon, 08 Aug 2022 11:47:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1659973638; s=strato-dkim-0002; d=ikherbers.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=96Qhr6bvJW8k6x6zsHy39FDcFlSDfoVdXX9GU0kikns=; b=B8RtAPVT9nLQnmkYNUlUKApIRY817xB9ywkmfi+6nfMkTL3YRIlQFPZZa5IMow2hEG GkEqMZnuI5BkoE8DixuLPeeoyLwvNIfsLpV51DDzB1jkEvE+C/2MoqkDfqiR5tGosDRO VNo1z90nRuDQbWaq5Lpyoydb4VOxKHHKuI4fVxlqUVzjmyFPpmIqVOulZChzi/Udepew eYtM03/5F3gQLm2CGOKaDRxXt8BP9Ed4qJdfouyOcu2PSUx6kFezSyIW/UuL743vtia/ JcsDj4DUlx5s5rgD1s3E8+WFTjV1A3CeHCPLegPdOEOuIIRn1CowuGrk8PmEkFJ+0SHE R2sA== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":IUwNfkitaf3qOWm2b/jA5tveVwUUcwH3PkiYp6DPxTDDEo4xO9ymAEzKSWlvmNAhIG6s" X-RZG-CLASS-ID: mo05 Received: from lambda.localdomain by smtp.strato.de (RZmta 47.47.0 DYNA|AUTH) with ESMTPSA id 0cac6cy78FlHoRF (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 8 Aug 2022 17:47:17 +0200 (CEST) From: vicvbcun Date: Mon, 8 Aug 2022 17:45:38 +0200 Message-Id: <9ad86be3dfcf6c7404120ff002627d033d87cc99.1659973115.git.guix@ikherbers.com> X-Mailer: git-send-email 2.37.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" X-getmail-retrieved-from-mailbox: Patches Remove logs that are not reproducible. * gnu/packages/algebra.scm (gap): Update to 4.11.1. [source]: Remove trailing #t. [arguments]<#:phases>: Remove trailing #t, use gexps. [install]: Install missing config.h header. --- gnu/packages/algebra.scm | 181 +++++++++++++++++++-------------------- 1 file changed, 90 insertions(+), 91 deletions(-) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 95fbdb5e36..c3b1c7fc3b 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -1209,17 +1209,17 @@ (define-public xtensor-benchmark (define-public gap (package (name "gap") - (version "4.11.0") + (version "4.11.1") (source (origin (method url-fetch) (uri (string-append "https://files.gap-system.org/gap-" (version-major+minor version) - "/tar.bz2/gap-" + "/tar.gz/gap-" version - ".tar.bz2")) + ".tar.gz")) (sha256 - (base32 "00l6hvy4iggnlrib4vp805sxdm3j7n3hzpv5zs9hbiiavh80l1xz")) + (base32 "01535s81h254zcs84zi95xqmhvvn6fn9qss8761myxc2gpdcadb6")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet '(begin @@ -1235,97 +1235,96 @@ (define-public gap ;; given by their names up to version numbers. (with-directory-excursion "pkg" (for-each delete-file-recursively - (lset-difference - (lambda (all keep) (string-prefix? keep all)) - (scandir ".") - '("." ".." - ;; Necessary packages. - "GAPDoc-" - "primgrp-" - "SmallGrp-" ; artistic2.0 - "transgrp" ; artistic2.0 for data, - ; gpl2 or gpl3 for code - ;; Recommended package. - "io-" ; gpl3+ - ;; Optional packages, searched for at start, - ;; and their depedencies. - "alnuth-" - "autpgrp-" - "crisp-" ; bsd-2 - "ctbllib" ; gpl3+, clarified in the next release; - ; see - ; http://www.math.rwth-aachen.de/~Thomas.Breuer/ctbllib/README.md - "FactInt-" - "fga" - "irredsol-" ; bsd-2 - "laguna-" - "polenta-" - "polycyclic-" - "radiroot-" - "resclasses-" - "sophus-" - "tomlib-" - "utils-")))) - #t)))) + (lset-difference + (lambda (all keep) (string-prefix? keep all)) + (scandir ".") + '("." ".." + ;; Necessary packages. + "GAPDoc-" + "primgrp-" + "SmallGrp-" ; artistic2.0 + "transgrp" ; artistic2.0 for data, + ; gpl2 or gpl3 for code + ;; Recommended package. + "io-" ; gpl3+ + ;; Optional packages, searched for at start, + ;; and their depedencies. + "alnuth-" + "autpgrp-" + "crisp-" ; bsd-2 + "ctbllib" ; gpl3+, clarified in the next release; + ; see + ; http://www.math.rwth-aachen.de/~Thomas.Breuer/ctbllib/README.md + "FactInt-" + "fga" + "irredsol-" ; bsd-2 + "laguna-" + "polenta-" + "polycyclic-" + "radiroot-" + "resclasses-" + "sophus-" + "tomlib-" + "utils-")))))))) (build-system gnu-build-system) (inputs (list gmp readline zlib)) (arguments - `(#:modules ((ice-9 ftw) - (srfi srfi-26) - (guix build gnu-build-system) - (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-after 'build 'build-packages - ;; Compile all packages that have not been deleted by the - ;; code snippet above. - (lambda _ - (setenv "CONFIG_SHELL" (which "bash")) - (with-directory-excursion "pkg" - (invoke "../bin/BuildPackages.sh") - #t))) - (add-after 'build-packages 'build-doc - ;; The documentation is bundled, but we create it from source. - (lambda _ - (with-directory-excursion "doc" - (invoke "./make_doc")) - #t)) - (replace 'install - (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") - (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"))) - #t))))) + (list #:modules '((ice-9 ftw) + (srfi srfi-26) + (guix build gnu-build-system) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'build-packages + ;; Compile all packages that have not been deleted by the + ;; code snippet above. + (lambda _ + (setenv "CONFIG_SHELL" (which "bash")) + (with-directory-excursion "pkg" + (invoke "../bin/BuildPackages.sh")))) + (add-after 'build-packages 'build-doc + ;; The documentation is bundled, but we create it from source. + (lambda _ + (with-directory-excursion "doc" + (invoke "./make_doc")))) + (replace 'install + (lambda _ + (let* ((bin (string-append #$output "/bin")) + (prog (string-append bin "/gap")) + (prog-real (string-append bin "/.gap-real")) + (share (string-append #$output "/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") + (invoke "make" "install-libgap") + (install-file "gen/config.h" (string-append #$output "/include/gap")) + ;; 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")) + ;; these log files are not reproducible + (delete-file (string-append share "/pkg/io-4.7.0/config.log")) + (delete-file-recursively (string-append share "/pkg/log")))))))) (home-page "https://www.gap-system.org/") (synopsis "System for computational group theory")