Skip to content

Commit

Permalink
Merge pull request #131493 from collares/polymake-4.4
Browse files Browse the repository at this point in the history
polymake: 3.2.rc4 -> 4.4
  • Loading branch information
SuperSandro2000 authored Aug 8, 2021
2 parents 4a42e7d + 045d6f3 commit fd26f35
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 16 deletions.
31 changes: 18 additions & 13 deletions pkgs/applications/science/math/polymake/default.nix
Original file line number Diff line number Diff line change
@@ -1,27 +1,32 @@
{ lib, stdenv, fetchurl
, ninja, libxml2, libxslt, readline, perl, gmp, mpfr, boost
, perl, gmp, mpfr, flint, boost
, bliss, ppl, singular, cddlib, lrs, nauty
, ant, openjdk
, ninja, ant, openjdk
, perlPackages
, makeWrapper
}:

# polymake compiles its own version of sympol and atint because we
# don't have those packages. other missing optional dependencies:
# javaview, libnormaliz, scip, soplex, jreality.

stdenv.mkDerivation rec {
pname = "polymake";
version = "3.2.rc4";
version = "4.4";

src = fetchurl {
url = "https://polymake.org/lib/exe/fetch.php/download/polymake-3.2r4.tar.bz2";
sha256 = "02jpkvy1cc6kc23vkn7nkndzr40fq1gkb3v257bwyi1h5d37fyqy";
# "The minimal version is a packager friendly version which omits
# the bundled sources of cdd, lrs, libnormaliz, nauty and jReality."
url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2";
sha256 = "sha256-2nF5F2xznI77pl2TslrxA8HLpw4fmzVnPOM8N3kOwJE=";
};

buildInputs = [
libxml2 libxslt readline perl gmp mpfr boost
perl gmp mpfr flint boost
bliss ppl singular cddlib lrs nauty
openjdk
] ++
(with perlPackages; [
XMLLibXML XMLLibXSLT XMLWriter TermReadLineGnu TermReadKey
] ++ (with perlPackages; [
JSON TermReadLineGnu TermReadKey XMLSAX
]);

nativeBuildInputs = [
Expand All @@ -36,11 +41,11 @@ stdenv.mkDerivation rec {
done
'';

meta = {
meta = with lib; {
description = "Software for research in polyhedral geometry";
license = lib.licenses.gpl2 ;
maintainers = [lib.maintainers.raskin];
platforms = lib.platforms.linux;
license = licenses.gpl2Plus;
maintainers = teams.sage.members;
platforms = platforms.linux;
homepage = "https://www.polymake.org/doku.php";
};
}
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26775,9 +26775,7 @@ in

polylith = callPackage ../development/tools/misc/polylith { };

polymake = callPackage ../applications/science/math/polymake {
openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
polymake = callPackage ../applications/science/math/polymake { };

pond = callPackage ../applications/networking/instant-messengers/pond { };

Expand Down

0 comments on commit fd26f35

Please sign in to comment.