From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id QA3jLkMIrGAWkwAAgWs5BA (envelope-from ) for ; Mon, 24 May 2021 22:10:43 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yNeeKkMIrGBjGAAA1q6Kng (envelope-from ) for ; Mon, 24 May 2021 20:10:43 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5EE2723B55 for ; Mon, 24 May 2021 22:10:43 +0200 (CEST) Received: from localhost ([::1]:50064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llGuQ-0003rp-El for larch@yhetil.org; Mon, 24 May 2021 16:10:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llGtq-0002tG-5o for guix-patches@gnu.org; Mon, 24 May 2021 16:10:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60652) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1llGtp-0002Hl-Ko for guix-patches@gnu.org; Mon, 24 May 2021 16:10:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1llGtp-0007P3-Ga for guix-patches@gnu.org; Mon, 24 May 2021 16:10:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48622] [PATCH core-updates 37/29] gnu: hypre: Update to 2020.0. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 May 2021 20:10:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48622 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48622@debbugs.gnu.org Received: via spool by 48622-submit@debbugs.gnu.org id=B48622.162188699528389 (code B ref 48622); Mon, 24 May 2021 20:10:05 +0000 Received: (at 48622) by debbugs.gnu.org; 24 May 2021 20:09:55 +0000 Received: from localhost ([127.0.0.1]:43958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llGtb-0007Ng-G8 for submit@debbugs.gnu.org; Mon, 24 May 2021 16:09:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1llGtY-0007Mu-F5 for 48622@debbugs.gnu.org; Mon, 24 May 2021 16:09:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49332) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1llGtT-00022w-B2 for 48622@debbugs.gnu.org; Mon, 24 May 2021 16:09:43 -0400 Received: from host-37-191-231-185.lynet.no ([37.191.231.185]:58204 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1llGtS-0007nn-Sa for 48622@debbugs.gnu.org; Mon, 24 May 2021 16:09:43 -0400 From: Marius Bakke Date: Mon, 24 May 2021 22:09:23 +0200 Message-Id: <20210524200923.28867-8-marius@gnu.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210524200923.28867-1-marius@gnu.org> References: <20210524144333.15566-1-marius@gnu.org> <20210524200923.28867-1-marius@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1621887043; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=gdI38nzrEUdxiCkZG4IdV0tUgB6SJszh+D/bN/cOpmA=; b=GmY6XzbOI1qViMpuRkpv5U3T6ZZPzmHqF0n/8gQs2kG1nC/9F5SRn2uhUEakGV1Uf8eEkI 14e+eqg8Bi9foRgIkLnXdt0Mhv6W9SVmVMd2WMi9E7kY4r4Qf94kslu0Z8bXYUKCxkS45M NbE058ekDVwlY+xLPQ0bGKyCdH+wR64p/Ht/SaHdlOWUeBRuhwxB2Xmvl3Mgqj07bit5VC 6KdRL0A9GwNUB3L+n7boAQfeqX5PsADxE3lk774ZUHfrPz5UI7xTLZMYe4Izalx3IJT4Gy SrpIZZHVuns/z+dsfbKUAfBgxKKGXAM9xMZlcy8HZaM6GQYOmvC2cimCu4l42w== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1621887043; a=rsa-sha256; cv=none; b=iBYID6QsTmaXYNSsrNgR+17sQRwp0aEt9HJmr+geUdgRQaPGO+Y2uGtWxKaoY7/B/IPirU QwhueDOHaVQULcaedrJ773iMFK8u6x3j7QFqeaTIyevRGXK5ffRiI5jlslMnb/1R6fByRS zbd5C4IaBsfV+GB5teXIMxOvpz7ptq2zNxSBaa/Jd5GGvRefLR7fabO0OZHeq21sbdUmdG FS6mW+FgQmCtpkxjefA0Ysr4Zsig52mawsBfJOgf6n8Cgt4VUEoNWCb1k2Gi2uRd4yoJ7w MwjjYdtb64PjjdorNjhf81Ague2unsZrL8NAUbyhUJseBapKC2cQ8Q4vnzzEbw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -1.93 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 5EE2723B55 X-Spam-Score: -1.93 X-Migadu-Scanner: scn0.migadu.com X-TUID: EJEvWidOuEV4 * gnu/packages/maths.scm (hypre): Update to 2020.0. [source](modules, snippet): Remove. [native-inputs]: Remove PERL, NETPBM and GHOSTSCRIPT. Add PYTHON, PYTHON-SPHINX and PYTHON-BREATHE. Add TEXLIVE-ADJUSTBOX, TEXLIVE-AMSFONTS, TEXLIVE-CAPTION, TEXLIVE-ETOOLBOX, TEXLIVE-JKNAPPEN, TEXLIVE-SECTSTY, TEXLIVE-TEX-GYRE, TEXLIVE-WASY, TEXLIVE-XCOLOR, TEXLIVE-GENERIC-LISTOFITEMS, TEXLIVE-GENERIC-ULEM, TEXLIVE-LATEX-CAPT-OF, TEXLIVE-LATEX-CMAP, TEXLIVE-LATEX-COLORTBL, TEXLIVE-LATEX-ETOC, TEXLIVE-LATEX-FANCYHDR, TEXLIVE-LATEX-FANCYVRB, TEXLIVE-LATEX-FLOAT, TEXLIVE-LATEX-FNCYCHAP, TEXLIVE-LATEX-FRAMED, TEXLIVE-LATEX-GEOMETRY, TEXLIVE-LATEX-HANGING, TEXLIVE-LATEX-MULTIROW, TEXLIVE-LATEX-NATBIB, TEXLIVE-LATEX-NEEDSPACE, TEXLIVE-LATEX-NEWUNICODECHAR, TEXLIVE-LATEX-PARSKIP, TEXLIVE-LATEX-STACKENGINE, TEXLIVE-LATEX-TABULARY, TEXLIVE-LATEX-TITLESEC, TEXLIVE-LATEX-TOCLOFT, TEXLIVE-LATEX-UPQUOTE, TEXLIVE-LATEX-VARWIDTH, TEXLIVE-LATEX-WASYSYM, and TEXLIVE-LATEX-WRAPFIG to TEXLIVE-UPDMAP.CFG. [arguments]: Adjust doc build target and installation phase. Remove trailing #t's. --- gnu/packages/maths.scm | 82 +++++++++++++++++++++++++++--------------- 1 file changed, 54 insertions(+), 28 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index dff5180ae9..d7ba5fca0a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018 Joshua Sierles, Nextjournal ;;; Copyright © 2018 Nadya Voronova ;;; Copyright © 2018 Adam Massmann -;;; Copyright © 2018, 2020 Marius Bakke +;;; Copyright © 2018, 2020, 2021 Marius Bakke ;;; Copyright © 2018 Eric Brown ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2018 Amin Bandali @@ -135,6 +135,7 @@ #:use-module (gnu packages tbb) #:use-module (gnu packages scheme) #:use-module (gnu packages shells) + #:use-module (gnu packages sphinx) #:use-module (gnu packages tcl) #:use-module (gnu packages texinfo) #:use-module (gnu packages tex) @@ -4611,7 +4612,7 @@ set.") (define-public hypre (package (name "hypre") - (version "2.15.1") + (version "2.20.0") (source (origin (method git-fetch) @@ -4620,28 +4621,55 @@ set.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1lvh4ybqkriyqfg2zmic6mrg1981qv1i9vry1fdgsabn81hb71g4")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove use of __DATE__ and __TIME__ for reproducibility; - ;; substitute the release date. - (substitute* "src/utilities/HYPRE_utilities.h" - (("Date Compiled: .*$") - "Date Compiled: Oct 19 2018 15:23:00 +0000\"\n")) - #t)))) + (base32 "14iqjwg5sv1qjn7c2cfv0xxmn9rwamjrhh9hgs8fjbywcbvrkjdi")))) (build-system gnu-build-system) - (outputs '("out" ; 6.1 MiB of headers and libraries - "doc")) ; 4.8 MiB of documentation + (outputs '("out" ;5.3 MiB of headers and libraries + "doc")) ;12 MiB of documentation (native-inputs `(("doc++" ,doc++) - ("netpbm" ,netpbm) - ("perl" ,perl) ; needed to run 'ppmquant' during tests - ("texlive" ,(texlive-updmap.cfg (list texlive-xypic - texlive-cm - texlive-latex-hyperref - texlive-bibtex))) - ("ghostscript" ,ghostscript))) + ("doxygen" ,doxygen) + ("python" ,python) + ("python-breathe" ,python-breathe) + ("python-sphinx" ,python-sphinx) + ("texlive" ,(texlive-updmap.cfg (list texlive-adjustbox + texlive-amsfonts + texlive-bibtex + texlive-caption + texlive-cm + texlive-etoolbox + texlive-jknappen + texlive-sectsty + texlive-tex-gyre + texlive-wasy + texlive-xcolor + texlive-xypic + texlive-generic-listofitems + texlive-generic-ulem + texlive-latex-capt-of + texlive-latex-cmap + texlive-latex-colortbl + texlive-latex-etoc + texlive-latex-fancyhdr + texlive-latex-fancyvrb + texlive-latex-float + texlive-latex-fncychap + texlive-latex-framed + texlive-latex-geometry + texlive-latex-hanging + texlive-latex-hyperref + texlive-latex-multirow + texlive-latex-natbib + texlive-latex-needspace + texlive-latex-newunicodechar + texlive-latex-parskip + texlive-latex-stackengine + texlive-latex-tabulary + texlive-latex-titlesec + texlive-latex-tocloft + texlive-latex-upquote + texlive-latex-varwidth + texlive-latex-wasysym + texlive-latex-wrapfig))))) (inputs `(("blas" ,openblas) ("lapack" ,lapack))) @@ -4671,7 +4699,7 @@ set.") configure-flags))))))) (add-after 'build 'build-docs (lambda _ - (invoke "make" "-Cdocs" "pdf" "html"))) + (invoke "make" "-C" "docs"))) (replace 'check (lambda _ (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/hypre/lib")) @@ -4682,8 +4710,7 @@ set.") (when (positive? size) (error (format #f "~a size ~d; error indication~%" filename size))))) - (find-files "test" ".*\\.err$")) - #t)) + (find-files "test" ".*\\.err$")))) (add-after 'install 'install-docs (lambda* (#:key outputs #:allow-other-keys) ;; Custom install because docs/Makefile doesn't honor ${docdir}. @@ -4692,10 +4719,9 @@ set.") (with-directory-excursion "docs" (for-each (lambda (base) (install-file (string-append base ".pdf") docdir) - (copy-recursively base docdir)) ; html docs - '("HYPRE_usr_manual" - "HYPRE_ref_manual"))) - #t)))))) + (copy-recursively (string-append base "-html") + (string-append docdir "/" base))) + '("usr-manual" "ref-manual"))))))))) (home-page "http://www.llnl.gov/casc/hypre/") (synopsis "Library of solvers and preconditioners for linear equations") (description -- 2.31.1