diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2023-04-06 01:08:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-06 01:08:07 +0200 |
| commit | 5ea854454e5af22f661ffe7b661eac584f4ecd76 (patch) | |
| tree | 91a96924c0fa2cece6031b86b9daa166255906a6 /pkgs/applications/science | |
| parent | 14604986ad7794de7f82b9620600214555a42a4a (diff) | |
| parent | 55fae22f98c2fa0d83cf773045fc0452f705e1d4 (diff) | |
Merge pull request #224359 from hesiod/coin-utils
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/clp/default.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index 26c277c2685f2..69635f30541cb 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" ]; |