From 5735af6cbccb51a2ad8d380acf4b978b4e7b3909 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 3 May 2020 04:20:00 -0500 Subject: [PATCH] drill: 0.5.0 -> 0.6.0 --- pkgs/tools/networking/drill/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 7636bd44d2d..572dc0d8384 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -3,23 +3,26 @@ , fetchFromGitHub , pkg-config , openssl +, Security }: rustPlatform.buildRustPackage rec { pname = "drill"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "fcsonline"; repo = pname; rev = version; - sha256 = "0aqd709fg0ha0lzri2p4pgraxvif7z8zcm8rx7sk6s2n605sc4gn"; + sha256 = "0pcc91nk68z7hlhj7xvh6v3rybxpy6bzv3pzjcyaq7l0szjljrpw"; }; - cargoSha256 = "1c8vmyf388kbbs56h8b62nxgxvgy9yj9cnmvax6ycnslkcwmvld0"; + cargoSha256 = "1611w8b60d3x16ik8v96za0mkr5p0f9gdpz0awprfgj6c3r6s16m"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; meta = with stdenv.lib; { description = "HTTP load testing application inspired by Ansible syntax"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bf311ea591..d01c4cfe287 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2974,7 +2974,9 @@ in driftnet = callPackage ../tools/networking/driftnet {}; - drill = callPackage ../tools/networking/drill { }; + drill = callPackage ../tools/networking/drill { + inherit (darwin.apple_sdk.frameworks) Security; + }; drone = callPackage ../development/tools/continuous-integration/drone { };