Merge pull request #43623 from oxij/tree/cleanups

trivial: cleanups
This commit is contained in:
Frederik Rietdijk 2018-07-16 21:22:04 +02:00 committed by GitHub
commit 2527218725
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 18 deletions

View file

@ -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 ];
};
}

View file

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ libevent openssl ];
doCheck = (!stdenv.isDarwin);
doCheck = !stdenv.isDarwin;
checkPhase = "ctest";
meta = with stdenv.lib; {