From 88d34b1dda9094516c0fc6ae9f17b44c8247e848 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Thu, 8 Mar 2018 13:55:38 -0800 Subject: [PATCH 1/2] gperftools: 2.6.1 -> 2.6.3 Semi-automatic update. These checks were done: - built on NixOS - ran `/nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3/bin/pprof --help` got 0 exit code - ran `/nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3/bin/pprof --help` and found version 2.6.3 - found 2.6.3 with grep in /nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3 - found 2.6.3 in filename of file in /nix/store/ba54ymdab4y2jcxwbmn71sm698cy1wik-gperftools-2.6.3 --- pkgs/development/libraries/gperftools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 5c863cf26cb..2a2710531e0 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libunwind }: stdenv.mkDerivation rec { - name = "gperftools-2.6.1"; + name = "gperftools-2.6.3"; src = fetchurl { url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz"; - sha256 = "10cxd6s5pkm2d934gh47hrn9xcrw4qlc9yr7s99z4a508bmngd1q"; + sha256 = "17zfivp6n00rlqbrx6q6h71y2f815nvlzysff1ihgk4mxpv2yjri"; }; buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; From 6a560f499c5a1038a573ea961ef1d1166e1b3677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 30 Apr 2018 07:43:57 +0100 Subject: [PATCH 2/2] gperftools: suppress compilation warning on macOS --- pkgs/development/libraries/gperftools/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 2a2710531e0..de71704cff8 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -16,7 +16,9 @@ stdenv.mkDerivation rec { substituteInPlace libtool --replace stdc++ c++ ''; - NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.isDarwin "-D_XOPEN_SOURCE"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.isDarwin [ + "-D_XOPEN_SOURCE" "-Wno-aligned-allocation-unavailable" + ]; # some packages want to link to the static tcmalloc_minimal # to drop the runtime dependency on gperftools