diff --git a/pkgs/applications/science/math/polymake/default.nix b/pkgs/applications/science/math/polymake/default.nix index b1abb31c7650..9566801479a3 100644 --- a/pkgs/applications/science/math/polymake/default.nix +++ b/pkgs/applications/science/math/polymake/default.nix @@ -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 = [ @@ -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"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 107722e6e102..2d54dbd596fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26547,9 +26547,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 { };