public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #46299 from r-ryantm/auto-update/capnproto 

capnproto: 0.6.1 -> 0.7.0
This commit is contained in:
Renaud 2018-10-21 16:43:37 +02:00 committed by GitHub
parent 994826f651 17c96ab275
commit 73f796aa62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/capnproto/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "capnproto-${version}"; name = "capnproto-${version}";
version = "0.6.1"; version = "0.7.0";
src = fetchurl { src = fetchurl {
url = "https://capnproto.org/capnproto-c++-${version}.tar.gz"; url = "https://capnproto.org/capnproto-c++-${version}.tar.gz";
sha256 = "010s9yhq4531wvdfrdf2477zswhck6cjfby79w73rff3v06090l0"; sha256 = "0hfdnhlbskagzgvby8wy6lrxj53zfzpfqimbhga68c0ji2yw1969";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {

6
pkgs/development/tools/analysis/rr/default.nix
View File

@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
patchShebangs . patchShebangs .
''; '';
# TODO: remove this preConfigure hook after 5.2.0 since it is fixed upstream
# see https://github.com/mozilla/rr/issues/2269
preConfigure = ''substituteInPlace CMakeLists.txt --replace "std=c++11" "std=c++14"'';
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
cmake libpfm zlib python2Packages.python python2Packages.pexpect which procps gdb capnproto cmake libpfm zlib python2Packages.python python2Packages.pexpect which procps gdb capnproto
@ -49,7 +53,7 @@ stdenv.mkDerivation rec {
time the same execution is replayed. time the same execution is replayed.
''; '';
license = "custom"; license = with stdenv.lib.licenses; [ mit bsd2 ];
maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ]; maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ];
platforms = stdenv.lib.platforms.x86; platforms = stdenv.lib.platforms.x86;
}; };