diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-01 18:05:48 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-01 18:05:48 +0000 |
commit | fbe95e7196552df01bceea7744ab0b1918aec90b (patch) | |
tree | 54bbbd00968ec1c7b540ab1750df60be5ff9e631 /pkgs/development/libraries/science | |
parent | 4ae3f9a06c832b7d125debe87a2fd0ec88ad165b (diff) | |
parent | fe8e8ad1120e726b8899b4532bf9f61fe54e7168 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/science')
-rw-r--r-- | pkgs/development/libraries/science/math/bonmin/default.nix | 51 | ||||
-rw-r--r-- | pkgs/development/libraries/science/math/trilinos/default.nix | 4 |
2 files changed, 54 insertions, 1 deletions
diff --git a/pkgs/development/libraries/science/math/bonmin/default.nix b/pkgs/development/libraries/science/math/bonmin/default.nix new file mode 100644 index 0000000000000..9526a6250184c --- /dev/null +++ b/pkgs/development/libraries/science/math/bonmin/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, gfortran +, pkg-config +, blas +, bzip2 +, cbc +, clp +, ipopt +, lapack +, libamplsolver +, zlib +}: + +assert (!blas.isILP64) && (!lapack.isILP64); + +stdenv.mkDerivation rec { + pname = "bonmin"; + version = "1.8.8"; + + src = fetchFromGitHub { + owner = "coin-or"; + repo = "Bonmin"; + rev = "releases/${version}"; + sha256 = "sha256-HU25WjvG01oL3U1wG6ivTcYaN51MMxgLdKZ3AkDNe2Y="; + }; + + nativeBuildInputs = [ + gfortran + pkg-config + ]; + buildInputs = [ + blas + bzip2 + cbc + clp + ipopt + lapack + libamplsolver + zlib + ]; + + meta = with lib; { + description = "An open-source code for solving general MINLP (Mixed Integer NonLinear Programming) problems"; + homepage = "https://github.com/coin-or/Bonmin"; + license = licenses.epl10; + platforms = platforms.unix; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/pkgs/development/libraries/science/math/trilinos/default.nix b/pkgs/development/libraries/science/math/trilinos/default.nix index 19d2119622e9d..1939b0a5307b7 100644 --- a/pkgs/development/libraries/science/math/trilinos/default.nix +++ b/pkgs/development/libraries/science/math/trilinos/default.nix @@ -59,7 +59,9 @@ let in stdenv.mkDerivation rec { pname = "trilinos"; - version = "12.12.1"; # Xyce 7.4 requires version 12.12.1 + # Xyce 7.4 requires version 12.12.1 + # nixpkgs-update: no auto update + version = "12.12.1"; src = fetchFromGitHub { owner = "trilinos"; |