diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2020-05-04 22:26:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-04 22:26:26 -0500 |
| commit | 179eded6e9153a741bfa0626bb35e49a474eea89 (patch) | |
| tree | 999f91eea83c1bf50be2df424c97d163359e21bf | |
| parent | 74fe0103928f51a57a6e961d2a1e5df1e014bf53 (diff) | |
| parent | 5735af6cbccb51a2ad8d380acf4b978b4e7b3909 (diff) | |
| download | nixlib-179eded6e9153a741bfa0626bb35e49a474eea89.tar nixlib-179eded6e9153a741bfa0626bb35e49a474eea89.tar.gz nixlib-179eded6e9153a741bfa0626bb35e49a474eea89.tar.bz2 nixlib-179eded6e9153a741bfa0626bb35e49a474eea89.tar.lz nixlib-179eded6e9153a741bfa0626bb35e49a474eea89.tar.xz nixlib-179eded6e9153a741bfa0626bb35e49a474eea89.tar.zst nixlib-179eded6e9153a741bfa0626bb35e49a474eea89.zip | |
Merge pull request #86697 from marsam/update-drill
drill: 0.5.0 -> 0.6.0
| -rw-r--r-- | pkgs/tools/networking/drill/default.nix | 13 | ||||
| -rw-r--r-- | 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 7636bd44d2db..572dc0d83848 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 fb7de0545f31..95517f754119 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2972,7 +2972,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 { }; |