diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-07-16 21:22:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-16 21:22:04 +0200 |
| commit | 2527218725ae613bf0cfcb1792afb646e182ac0d (patch) | |
| tree | 60bafd76a5b64a035860d58df09510a736611a5d | |
| parent | 9a32dafd05e5acb8c0c5cfa81a6be0958e06623c (diff) | |
| parent | e80ca2182cc0af78659c9611d434f65e7e5a6fb9 (diff) | |
| download | nixlib-2527218725ae613bf0cfcb1792afb646e182ac0d.tar nixlib-2527218725ae613bf0cfcb1792afb646e182ac0d.tar.gz nixlib-2527218725ae613bf0cfcb1792afb646e182ac0d.tar.bz2 nixlib-2527218725ae613bf0cfcb1792afb646e182ac0d.tar.lz nixlib-2527218725ae613bf0cfcb1792afb646e182ac0d.tar.xz nixlib-2527218725ae613bf0cfcb1792afb646e182ac0d.tar.zst nixlib-2527218725ae613bf0cfcb1792afb646e182ac0d.zip | |
Merge pull request #43623 from oxij/tree/cleanups
trivial: cleanups
| -rw-r--r-- | pkgs/applications/science/math/clp/default.nix | 32 | ||||
| -rw-r--r-- | pkgs/development/libraries/libcouchbase/default.nix | 2 |
2 files changed, 16 insertions, 18 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 ]; + }; } diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 6531a4cd9ed4..347e3218c1dc 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -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; { |