From c42ebb0ccc55797a2b224ebaad62beb440964058 Mon Sep 17 00:00:00 2001 From: Ricardo Silva Date: Mon, 4 Nov 2019 00:44:34 +0100 Subject: Polymake: new version and more dependencies (#13399) * New package: perl-term-readline-gnu * polymake dependency * perl-term-readline-gnu: flake8 * New package: perl-xml-libxslt * polymake dependency * ppl: new version 1.2 Conflicts: var/spack/repos/builtin/packages/ppl/package.py * polymake: new version and dependencies Conflicts: var/spack/repos/builtin/packages/polymake/package.py * perl-xml-libxslt: missing dependency --- .../builtin/packages/perl-term-readline-gnu/package.py | 16 ++++++++++++++++ .../repos/builtin/packages/perl-xml-libxslt/package.py | 17 +++++++++++++++++ var/spack/repos/builtin/packages/polymake/package.py | 14 +++++++++++--- var/spack/repos/builtin/packages/ppl/package.py | 1 + 4 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 var/spack/repos/builtin/packages/perl-term-readline-gnu/package.py create mode 100644 var/spack/repos/builtin/packages/perl-xml-libxslt/package.py diff --git a/var/spack/repos/builtin/packages/perl-term-readline-gnu/package.py b/var/spack/repos/builtin/packages/perl-term-readline-gnu/package.py new file mode 100644 index 0000000000..7235b244c1 --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-term-readline-gnu/package.py @@ -0,0 +1,16 @@ +# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack import * + + +class PerlTermReadlineGnu(PerlPackage): + """Perl extension for the GNU Readline/History Library.""" + + homepage = "https://metacpan.org/pod/Term::ReadLine::Gnu" + url = "https://cpan.metacpan.org/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.36.tar.gz" + + version('1.36', sha256='9a08f7a4013c9b865541c10dbba1210779eb9128b961250b746d26702bab6925') + + depends_on('readline') diff --git a/var/spack/repos/builtin/packages/perl-xml-libxslt/package.py b/var/spack/repos/builtin/packages/perl-xml-libxslt/package.py new file mode 100644 index 0000000000..1c5ec6582a --- /dev/null +++ b/var/spack/repos/builtin/packages/perl-xml-libxslt/package.py @@ -0,0 +1,17 @@ +# Copyright 2013-2019 Lawrence Livermore National Security, LLC and other +# Spack Project Developers. See the top-level COPYRIGHT file for details. +# +# SPDX-License-Identifier: (Apache-2.0 OR MIT) +from spack import * + + +class PerlXmlLibxslt(PerlPackage): + """Interface to the GNOME libxslt library.""" + + homepage = "https://metacpan.org/pod/XML::LibXSLT" + url = "https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.96.tar.gz" + + version('1.96', sha256='2a5e374edaa2e9f9d26b432265bfea9b4bb7a94c9fbfef9047b298fce844d473') + + depends_on('libxslt') + depends_on('perl-xml-libxml') diff --git a/var/spack/repos/builtin/packages/polymake/package.py b/var/spack/repos/builtin/packages/polymake/package.py index 556d31a587..3093fefb5a 100644 --- a/var/spack/repos/builtin/packages/polymake/package.py +++ b/var/spack/repos/builtin/packages/polymake/package.py @@ -2,8 +2,6 @@ # Spack Project Developers. See the top-level COPYRIGHT file for details. # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - - from spack import * @@ -12,18 +10,28 @@ class Polymake(Package): homepage = "https://polymake.org/doku.php" url = "https://polymake.org/lib/exe/fetch.php/download/polymake-3.0r1.tar.bz2" + version('3.5', sha256='c649f8536ccef5a5e22b82c514a09278ebcd99d0815aa7170461fe12843109bd') version('3.0r2', sha256='e7c0f8e3a45ea288d2fb4ae781a1dcea913ef9c275fed401632cdb11a672d6dc') version('3.0r1', sha256='cdc223716b1cc3f4f3cc126089a438f9d12390caeed78291a87565717c7b504d') # Note: Could also be built with nauty instead of bliss - depends_on("bliss") depends_on("boost") depends_on("cddlib") depends_on("gmp") depends_on("lrslib") depends_on("mpfr") + depends_on("ninja", type='build', when='@3.2:') + depends_on("perl") + depends_on("perl-json") + depends_on("perl-term-readkey") + depends_on("perl-term-readline-gnu") + depends_on("perl-xml-libxml") + depends_on("perl-xml-libxslt") + depends_on("perl-xml-writer") depends_on("ppl") + depends_on("ppl@1.2:", when='@3.2:') + depends_on("readline") def install(self, spec, prefix): configure("--prefix=%s" % prefix, diff --git a/var/spack/repos/builtin/packages/ppl/package.py b/var/spack/repos/builtin/packages/ppl/package.py index e511f00158..27e77dcf2f 100644 --- a/var/spack/repos/builtin/packages/ppl/package.py +++ b/var/spack/repos/builtin/packages/ppl/package.py @@ -23,6 +23,7 @@ class Ppl(Package): homepage = "http://bugseng.com/products/ppl/" url = "http://bugseng.com/products/ppl/download/ftp/releases/1.1/ppl-1.1.tar.gz" + version('1.2', sha256='6bc36dd4a87abc429d8f9c00c53e334e5041a9b0857cfc00dbad6ef14294aac8') version('1.1', sha256='46f073c0626234f0b1a479356c0022fe5dc3c9cf10df1a246c9cde81f7cf284d') depends_on("gmp") -- cgit v1.2.3-70-g09d2