From 1718fc0b044d8085c8acb40617757f6d886b48ac Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Sat, 1 Apr 2023 17:41:38 +0200 Subject: clp: 1.17.6 -> 1.17.7 --- pkgs/applications/science/math/clp/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index 26c277c2685f2..a9283fe9adad8 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -1,14 +1,18 @@ -{ 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; -- cgit 1.4.1 From eae9398010a6fd99971cd8047538186b8c0f3276 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Mon, 3 Apr 2023 12:57:50 +0200 Subject: clp: Change license to epl20 --- pkgs/applications/science/math/clp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index a9283fe9adad8..69635f30541cb 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { 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" ]; -- cgit 1.4.1