From 3bac29ba106086b96a82267f7beee86ffea319a4 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Sat, 1 Apr 2023 17:39:31 +0200 Subject: [PATCH 1/5] coin-utils: init at 2.11.6 --- .../science/math/coin-utils/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/science/math/coin-utils/default.nix 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 00000000000..e725ca7cd85 --- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec05450002f..438b30f587c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37054,6 +37054,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 { }; From daa4d3a33106e2b29d16b4af19a3172eec26c4fc Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Sat, 1 Apr 2023 17:40:24 +0200 Subject: [PATCH 2/5] osi: 0.108.6 -> 0.108.7 --- .../libraries/science/math/osi/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index 713616b1a50..7535a6b1c75 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 ]; From 1718fc0b044d8085c8acb40617757f6d886b48ac Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Sat, 1 Apr 2023 17:41:38 +0200 Subject: [PATCH 3/5] clp: 1.17.6 -> 1.17.7 --- pkgs/applications/science/math/clp/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index 26c277c2685..a9283fe9ada 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; From eae9398010a6fd99971cd8047538186b8c0f3276 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Mon, 3 Apr 2023 12:57:50 +0200 Subject: [PATCH 4/5] clp: Change license to epl20 --- pkgs/applications/science/math/clp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index a9283fe9ada..69635f30541 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" ]; From 55fae22f98c2fa0d83cf773045fc0452f705e1d4 Mon Sep 17 00:00:00 2001 From: Tobias Markus Date: Mon, 3 Apr 2023 12:58:00 +0200 Subject: [PATCH 5/5] osi: Change license to epl20 --- pkgs/development/libraries/science/math/osi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/osi/default.nix b/pkgs/development/libraries/science/math/osi/default.nix index 7535a6b1c75..e29fa2e3d18 100644 --- a/pkgs/development/libraries/science/math/osi/default.nix +++ b/pkgs/development/libraries/science/math/osi/default.nix @@ -37,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 ]; };