pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #31777 from romildo/upd.catch

catch: 1.9.6 -> 1.11.0

authored by

Orivej Desh and committed by
GitHub af748afe c8e5b073

+6 -4
unified split
+3 -3
pkgs/development/libraries/catch/default.nix
··· 2 3 stdenv.mkDerivation rec { 4 name = "catch-${version}"; 5 - version = "1.9.6"; 6 7 src = fetchFromGitHub { 8 - owner = "philsquared"; 9 repo = "Catch"; 10 rev = "v${version}"; 11 - sha256 = "0nqnyw6haa2771748ycag4hhjb8ni32cv4f7w3h0pji212542xan"; 12 }; 13 14 nativeBuildInputs = [ cmake ];
··· 2 3 stdenv.mkDerivation rec { 4 name = "catch-${version}"; 5 + version = "1.11.0"; 6 7 src = fetchFromGitHub { 8 + owner = "catchorg"; 9 repo = "Catch"; 10 rev = "v${version}"; 11 + sha256 = "0v9yw7ydvhydp78hh7cmaif4h73k5qxqpm1g7xn8i882i3s84s2s"; 12 }; 13 14 nativeBuildInputs = [ cmake ];
+3 -1
pkgs/development/libraries/libjson-rpc-cpp/default.nix
··· 34 -DCMAKE_BUILD_TYPE=Release 35 ''; 36 37 - installPhase = '' 38 mkdir -p $out 39 40 function fixRunPath { ··· 55 56 nativeBuildInputs = [ pkgconfig ]; 57 buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ]; 58 59 meta = with stdenv.lib; { 60 description = "C++ framework for json-rpc (json remote procedure call)";
··· 34 -DCMAKE_BUILD_TYPE=Release 35 ''; 36 37 + installPhase = '' 38 mkdir -p $out 39 40 function fixRunPath { ··· 55 56 nativeBuildInputs = [ pkgconfig ]; 57 buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ]; 58 + 59 + enableParallelBuilding = true; 60 61 meta = with stdenv.lib; { 62 description = "C++ framework for json-rpc (json remote procedure call)";