diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index 26c277c2685f..69635f30541c 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchFromGitHub, pkg-config, coin-utils, zlib, osi }: stdenv.mkDerivation rec { - version = "1.17.6"; + version = "1.17.7"; pname = "clp"; - src = fetchurl { - url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; - sha256 = "0ap1f0lxppa6pnbc4bg7ih7a96avwaki482nig8w5fr3vg9wvkzr"; + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Clp"; + rev = "releases/${version}"; + hash = "sha256-CfAK/UbGaWvyk2ZxKEgziVruzZfz7WMJVi/YvdR/UNA="; }; - propagatedBuildInputs = [ zlib ]; + nativeBuildInputs = [ pkg-config ]; + + propagatedBuildInputs = [ zlib coin-utils osi ]; doCheck = true; meta = with lib; { - license = licenses.epl10; + license = licenses.epl20; homepage = "https://github.com/coin-or/Clp"; description = "An open-source linear programming solver written in C++"; platforms = platforms.darwin ++ [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/science/math/coin-utils/default.nix b/pkgs/development/libraries/science/math/coin-utils/default.nix new file mode 100644 index 000000000000..e725ca7cd85c --- /dev/null +++ b/pkgs/development/libraries/science/math/coin-utils/default.nix @@ -0,0 +1,22 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config }: + +stdenv.mkDerivation rec { + version = "2.11.6"; + pname = "coinutils"; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "CoinUtils"; + rev = "releases/${version}"; + hash = "sha256-avXp7eKSZ/Fe1QmSJiNDMnPQ70LlOHrBeUYb9lhka8c="; + }; + + doCheck = true; + + meta = with lib; { + license = licenses.epl20; + homepage = "https://github.com/coin-or/CoinUtils"; + description = "Collection of classes and helper functions that are generally useful to multiple COIN-OR projects"; + maintainers = with maintainers; [ tmarkus ]; + }; +} diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index 713616b1a50f..e29fa2e3d185 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -1,19 +1,21 @@ -{ stdenv, lib, fetchurl, gfortran, pkg-config -, blas, zlib, bzip2 +{ stdenv, lib, fetchFromGitHub, gfortran, pkg-config +, blas, zlib, bzip2, coin-utils , withGurobi ? false, gurobi , withCplex ? false, cplex }: stdenv.mkDerivation rec { pname = "osi"; - version = "0.108.6"; + version = "0.108.7"; - src = fetchurl { - url = "https://www.coin-or.org/download/source/Osi/Osi-${version}.tgz"; - sha256 = "1n2jlpq4aikbp0ncs16f7q1pj7yk6kny1bh4fmjaqnwrjw63zvsp"; + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Osi"; + rev = "releases/${version}"; + hash = "sha256-MTmt/MgsfEAXor2EZXJX05bQg5oOtMaN7oNxGv2PHJg="; }; buildInputs = - [ blas zlib bzip2 ] + [ blas zlib bzip2 coin-utils ] ++ lib.optional withGurobi gurobi ++ lib.optional withCplex cplex; nativeBuildInputs = [ gfortran pkg-config ]; @@ -35,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An abstract base class to a generic linear programming (LP) solver"; homepage = "https://github.com/coin-or/Osi"; - license = licenses.epl10; + license = licenses.epl20; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 815e0ba64f61..0683a2c78597 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37185,6 +37185,8 @@ with pkgs; cliquer = callPackage ../development/libraries/science/math/cliquer { }; + coin-utils = callPackage ../development/libraries/science/math/coin-utils { }; + ecos = callPackage ../development/libraries/science/math/ecos { }; flintqs = callPackage ../development/libraries/science/math/flintqs { };