diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2018-10-21 16:43:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-21 16:43:37 +0200 |
| commit | 73f796aa62dd5ee3d44772521f2b08327e74e621 (patch) | |
| tree | 1d2013b8c458c6039902d195414172112b727c3f | |
| parent | 994826f6512c43ae3f4691b64c283a61259d91d1 (diff) | |
| parent | 17c96ab275f89ace1ed335a0a1d3fb865b41d074 (diff) | |
| download | nixlib-73f796aa62dd5ee3d44772521f2b08327e74e621.tar nixlib-73f796aa62dd5ee3d44772521f2b08327e74e621.tar.gz nixlib-73f796aa62dd5ee3d44772521f2b08327e74e621.tar.bz2 nixlib-73f796aa62dd5ee3d44772521f2b08327e74e621.tar.lz nixlib-73f796aa62dd5ee3d44772521f2b08327e74e621.tar.xz nixlib-73f796aa62dd5ee3d44772521f2b08327e74e621.tar.zst nixlib-73f796aa62dd5ee3d44772521f2b08327e74e621.zip | |
Merge pull request #46299 from r-ryantm/auto-update/capnproto
capnproto: 0.6.1 -> 0.7.0
| -rw-r--r-- | pkgs/development/libraries/capnproto/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/analysis/rr/default.nix | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/libraries/capnproto/default.nix b/pkgs/development/libraries/capnproto/default.nix index 78fcad5c1fe2..b175250872f3 100644 --- a/pkgs/development/libraries/capnproto/default.nix +++ b/pkgs/development/libraries/capnproto/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "capnproto-${version}"; - version = "0.6.1"; + version = "0.7.0"; src = fetchurl { url = "https://capnproto.org/capnproto-c++-${version}.tar.gz"; - sha256 = "010s9yhq4531wvdfrdf2477zswhck6cjfby79w73rff3v06090l0"; + sha256 = "0hfdnhlbskagzgvby8wy6lrxj53zfzpfqimbhga68c0ji2yw1969"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 9c2419b53589..cd2fb21209c4 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { 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 ]; buildInputs = [ cmake libpfm zlib python2Packages.python python2Packages.pexpect which procps gdb capnproto @@ -49,7 +53,7 @@ stdenv.mkDerivation rec { time the same execution is replayed. ''; - license = "custom"; + license = with stdenv.lib.licenses; [ mit bsd2 ]; maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ]; platforms = stdenv.lib.platforms.x86; }; |