diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-11-17 22:46:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 22:46:14 +0000 |
| commit | af748afe33a578b7316ece5bb30581fd433df144 (patch) | |
| tree | 89cca5acfa597589174217b6fdf43bc21b647fce | |
| parent | c8e5b0735000675f40e2eee356023cca08657f9e (diff) | |
| parent | b5148cec8f18a1d36d3882d8dbed7e2a09a4db31 (diff) | |
| download | nixpkgs-af748afe33a578b7316ece5bb30581fd433df144.tar nixpkgs-af748afe33a578b7316ece5bb30581fd433df144.tar.gz nixpkgs-af748afe33a578b7316ece5bb30581fd433df144.tar.bz2 nixpkgs-af748afe33a578b7316ece5bb30581fd433df144.tar.lz nixpkgs-af748afe33a578b7316ece5bb30581fd433df144.tar.xz nixpkgs-af748afe33a578b7316ece5bb30581fd433df144.tar.zst nixpkgs-af748afe33a578b7316ece5bb30581fd433df144.zip | |
Merge pull request #31777 from romildo/upd.catch
catch: 1.9.6 -> 1.11.0
| -rw-r--r-- | pkgs/development/libraries/catch/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/libjson-rpc-cpp/default.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 66ced59c26d..6c20f4d6c91 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "catch-${version}"; - version = "1.9.6"; + version = "1.11.0"; src = fetchFromGitHub { - owner = "philsquared"; + owner = "catchorg"; repo = "Catch"; rev = "v${version}"; - sha256 = "0nqnyw6haa2771748ycag4hhjb8ni32cv4f7w3h0pji212542xan"; + sha256 = "0v9yw7ydvhydp78hh7cmaif4h73k5qxqpm1g7xn8i882i3s84s2s"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 7c0bc358ea9..87cae224685 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { -DCMAKE_BUILD_TYPE=Release ''; - installPhase = '' + installPhase = '' mkdir -p $out function fixRunPath { @@ -56,6 +56,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "C++ framework for json-rpc (json remote procedure call)"; homepage = https://github.com/cinemast/libjson-rpc-cpp; |