From 0c3a544f918dd9f154cbdee81531fc428142f8b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Nov 2017 20:10:19 -0200 Subject: [PATCH 1/2] catch: 1.9.6 -> 1.11.0 --- pkgs/development/libraries/catch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 66ced59c26d7..6c20f4d6c910 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 ]; From b5148cec8f18a1d36d3882d8dbed7e2a09a4db31 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Fri, 17 Nov 2017 22:44:01 +0000 Subject: [PATCH 2/2] libjson-rpc-cpp: enable parallel building --- pkgs/development/libraries/libjson-rpc-cpp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index 7c0bc358ea9c..87cae2246852 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;