From ad72e5fbc34e05a34b2f56d9eb2a1e03113c52ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Mar 2021 13:25:27 +0100 Subject: [PATCH 1/4] google-cloud-cpp: remove packages which are no longer required after #116317 --- pkgs/development/libraries/google-cloud-cpp/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index af4512814026..d493f31d3750 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -9,10 +9,8 @@ , doxygen , protobuf , crc32c -, c-ares , fetchurl , openssl -, zlib , libnsl }: let @@ -33,7 +31,7 @@ let }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ c-ares c-ares.cmake-config grpc openssl protobuf zlib ]; + buildInputs = [ grpc openssl protobuf ]; postPatch = '' sed -e 's,https://github.com/googleapis/googleapis/archive/9c9f778aedde02f9826d2ae5d0f9c96409ba0f25.tar.gz,file://${googleapis},' \ @@ -55,7 +53,7 @@ in stdenv.mkDerivation rec { sha256 = "15wci4m8h6py7fqfziq8mp5m6pxp2h1cbh5rp2k90mk5js4jb9pa"; }; - buildInputs = [ curl crc32c c-ares c-ares.cmake-config googleapis-cpp-cmakefiles grpc protobuf libnsl ]; + buildInputs = [ curl crc32c googleapis-cpp-cmakefiles grpc protobuf libnsl ]; nativeBuildInputs = [ clang-tools cmake pkg-config doxygen ]; outputs = [ "out" "dev" ]; From f8c249118407e367d78127fd6c68eba9a3781dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Mar 2021 13:25:50 +0100 Subject: [PATCH 2/4] lightstep-tracer-cpp: remove packages which are no longer required after #116317, cleanup ? null --- .../libraries/lightstep-tracer-cpp/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix index d47c7b50abef..8ef4513a18dd 100644 --- a/pkgs/development/libraries/lightstep-tracer-cpp/default.nix +++ b/pkgs/development/libraries/lightstep-tracer-cpp/default.nix @@ -1,12 +1,8 @@ { stdenv, lib, fetchFromGitHub, pkg-config, cmake -, opentracing-cpp, protobuf, zlib -, enableGrpc ? false, grpc ? null, openssl ? null, c-ares ? null +, opentracing-cpp, protobuf +, enableGrpc ? false, grpc, openssl }: -assert enableGrpc -> grpc != null; -assert enableGrpc -> openssl != null; -assert enableGrpc -> c-ares != null; - stdenv.mkDerivation rec { pname = "lightstep-tracer-cpp"; version = "0.14.0"; @@ -23,9 +19,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - opentracing-cpp protobuf zlib + opentracing-cpp protobuf ] ++ lib.optionals enableGrpc [ - grpc openssl c-ares c-ares.cmake-config + grpc openssl ]; cmakeFlags = lib.optionals (!enableGrpc) [ "-DWITH_GRPC=OFF" ]; From 46c7097a0a41e634ae63279b7b03beb8aff3002c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Mar 2021 13:26:01 +0100 Subject: [PATCH 3/4] sysdig: remove packages which are no longer required after #116317 --- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index ecbd23e117f4..23e78dd848ed 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, kernel, installShellFiles -, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, c-ares, protobuf, grpc +, luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc }: with lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl installShellFiles ]; buildInputs = [ - zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb c-ares protobuf grpc + luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb protobuf grpc ] ++ optionals (kernel != null) kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; From bfe371986fd48f08edfd203b0f30fc9aff92cbef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 16 Mar 2021 13:26:06 +0100 Subject: [PATCH 4/4] rippled: remove packages which are no longer required after #116317 --- pkgs/servers/rippled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index cd19c77cab3e..22195265ebf5 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchgit, fetchurl, git, cmake, pkg-config -, openssl, zlib, boost, grpc, c-ares, abseil-cpp, protobuf3_8, libnsl }: +, openssl, boost, grpc, abseil-cpp, protobuf3_8, libnsl }: let sqlite3 = fetchurl rec { @@ -130,7 +130,7 @@ in stdenv.mkDerivation rec { cmakeFlags = ["-Dstatic=OFF" "-DBoost_NO_BOOST_CMAKE=ON"]; nativeBuildInputs = [ pkg-config cmake git ]; - buildInputs = [ openssl openssl.dev boostSharedStatic zlib grpc c-ares c-ares.cmake-config abseil-cpp protobuf3_8 libnsl ]; + buildInputs = [ openssl openssl.dev boostSharedStatic grpc abseil-cpp protobuf3_8 libnsl ]; preConfigure = '' export HOME=$PWD