alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #31777 from romildo/upd.catch

Browse source 
catch: 1.9.6 -> 1.11.0
This commit is contained in:
Orivej Desh 2017-11-17 22:46:14 +00:00 committed by GitHub
parent c8e5b07350 b5148cec8f
commit af748afe33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/catch/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "catch-${version}"; name = "catch-${version}";
version = "1.9.6"; version = "1.11.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "philsquared"; owner = "catchorg";
repo = "Catch"; repo = "Catch";
rev = "v${version}"; rev = "v${version}";
sha256 = "0nqnyw6haa2771748ycag4hhjb8ni32cv4f7w3h0pji212542xan"; sha256 = "0v9yw7ydvhydp78hh7cmaif4h73k5qxqpm1g7xn8i882i3s84s2s";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

4
pkgs/development/libraries/libjson-rpc-cpp/default.nix
View file

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
-DCMAKE_BUILD_TYPE=Release -DCMAKE_BUILD_TYPE=Release
''; '';
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
function fixRunPath { function fixRunPath {
@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ]; buildInputs = [ cmake jsoncpp argtable curl libmicrohttpd doxygen catch ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "C++ framework for json-rpc (json remote procedure call)"; description = "C++ framework for json-rpc (json remote procedure call)";
homepage = https://github.com/cinemast/libjson-rpc-cpp; homepage = https://github.com/cinemast/libjson-rpc-cpp;