diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:05:50 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-17 10:05:50 +0200 |
commit | 12949bf84ab06bebb854a07082bf5c32f5e14892 (patch) | |
tree | e521ba305aa4848b216a15e2eac0e69acdb0d1e9 /pkgs/applications | |
parent | e1625a8377ecce59b1320e556aecdc60b9e6d9db (diff) | |
parent | 1ae2f10642ea00a423354dd3176c55e47dbf3f6e (diff) | |
download | nixlib-12949bf84ab06bebb854a07082bf5c32f5e14892.tar nixlib-12949bf84ab06bebb854a07082bf5c32f5e14892.tar.gz nixlib-12949bf84ab06bebb854a07082bf5c32f5e14892.tar.bz2 nixlib-12949bf84ab06bebb854a07082bf5c32f5e14892.tar.lz nixlib-12949bf84ab06bebb854a07082bf5c32f5e14892.tar.xz nixlib-12949bf84ab06bebb854a07082bf5c32f5e14892.tar.zst nixlib-12949bf84ab06bebb854a07082bf5c32f5e14892.zip |
Merge master into staging
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/science/math/clp/default.nix | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/pkgs/applications/science/math/clp/default.nix b/pkgs/applications/science/math/clp/default.nix index daa9a53c59a1..4899ebe42d77 100644 --- a/pkgs/applications/science/math/clp/default.nix +++ b/pkgs/applications/science/math/clp/default.nix @@ -1,24 +1,22 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - version = "1.16.11"; - name = "clp-${version}"; - src = fetchurl { - url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; - sha256 = "0fazlqpp845186nmixa9f1xfxqqkdr1xj4va7q29m8594ca4a9dm"; - }; + version = "1.16.11"; + name = "clp-${version}"; + src = fetchurl { + url = "https://www.coin-or.org/download/source/Clp/Clp-${version}.tgz"; + sha256 = "0fazlqpp845186nmixa9f1xfxqqkdr1xj4va7q29m8594ca4a9dm"; + }; - propagatedBuildInputs = [ zlib ]; + propagatedBuildInputs = [ zlib ]; - doCheck = true; + doCheck = true; - checkTarget = "test"; - - meta = { - license = stdenv.lib.licenses.epl10; - homepage = https://projects.coin-or.org/Clp; - description = "An open-source linear programming solver written in C++"; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - }; + meta = { + license = stdenv.lib.licenses.epl10; + homepage = https://projects.coin-or.org/Clp; + description = "An open-source linear programming solver written in C++"; + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; } |