diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-22 00:32:46 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-22 00:32:46 +0100 |
| commit | 3e6c5a25f38697c088a1ab38a12ab81f21f3849e (patch) | |
| tree | f46b38a83da6904c0daa4d4f9de66b6dd1f629c8 /pkgs/tools | |
| parent | 09cc8872ef8b362187ffdef1eaabf71c7f7265ab (diff) | |
| parent | 4f79874f5708b16dbf03b80af5f47fd61c9d116d (diff) | |
| download | nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.gz nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.bz2 nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.lz nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.xz nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.tar.zst nixlib-3e6c5a25f38697c088a1ab38a12ab81f21f3849e.zip | |
Merge branch 'staging'
In particular, this upgrades the default gcc: 6 -> 7. Fixes #27794, /cc #31747.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/admin/awscli/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/dhcp/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/ntopng/default.nix | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index ef5afb917663..4c6a91ec321b 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -26,12 +26,12 @@ let in buildPythonPackage rec { pname = "awscli"; - version = "1.14.32"; + version = "1.14.41"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "09i82nf43pv5v598wvbj4nk1bfc64wp7xzlx5ykaca5m40lkarz0"; + sha256 = "8cf2a52d56f26e22e2fbd7b72649ef1d3de8930df7a730d7f27418d129bb3a6a"; }; # No tests included diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index e7a593ff830c..1812e95dcbb7 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ] ++ stdenv.lib.optionals (openldap != null) [ "--with-ldap" "--with-ldapcrypto" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=pointer-compare" ]; + installFlags = [ "DESTDIR=\${out}" ]; postInstall = diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index d1a90d9d1aad..b307a8f6f131 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { sed 's|LIBS += -lstdc++.6||' -i Makefile ''; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + meta = with stdenv.lib; { description = "High-speed web-based traffic analysis and flow collection tool"; homepage = http://www.ntop.org/products/ntop/; |