Merge branch 'master' into staging

* master: (293 commits)
  go_1_9: skip flaky TestServerCancelsReadTimeoutWhenIdle
  qsyncthingtray: fix build
  qt56.qtwebengine: fix build
  stdman: d860212 -> 2017.04.02
  jackett: use mono50
  hg-git: disable with python3
  hg-git: 0.8.5 -> 0.8.10
  xfce4-settings: enable parallel building
  gcc-snapshot: mark as broken
  heaptrack: 2017-02-14 -> 2017-10-30
  nixos-container: Modify existing test to cover show-ip command
  nixos-container: Make show-ip work together with ipv4 + netmask
  linux-copperhead: 4.13.12.a -> 4.13.13.a
  matterbridge: 1.1.0 -> 1.4.1
  nixos/nghttpx: add module for the nghttpx proxy server (#31680)
  mattermost: 4.3.0 -> 4.4.0
  breakpad: delete
  simp_le: 0.2.0 -> 0.6.1
  certbot: 0.11.1 -> 0.19.0
  afl: 2.51b -> 2.52b
  ...
This commit is contained in:
Orivej Desh
2017-11-17 05:35:09 +00:00
349 changed files with 9856 additions and 68183 deletions

View File

@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
name = "heaptrack-${version}";
version = "2017-02-14";
version = "2017-10-30";
src = fetchFromGitHub {
owner = "KDE";
repo = "heaptrack";
rev = "2469003b3172874e1df7e1f81c56e469b80febdb";
sha256 = "0dqchd2r4khv9gzj4n0qjii2nqygkj5jclkji8jbvivx5qwsqznc";
rev = "2bf49bc4fed144e004a9cabd40580a0f0889758f";
sha256 = "0sqxk5cc8r2vsj5k2dj9jkd1f2x2yj3mxgsp65g7ls01bgga0i4d";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];