diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2019-11-11 18:31:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-11 18:31:43 +0100 |
| commit | c64e9dadfe4e8c52e0bf0df8f4d54038674b5a75 (patch) | |
| tree | c67d13dbab3d625e7a689013a1b577424df9a40f /pkgs | |
| parent | 556a169f14f4970927b8c18a997dbf323ed9a865 (diff) | |
| parent | 776d4c13acdaacc8e5497addf1ade153604a69c6 (diff) | |
| download | nixpkgs-c64e9dadfe4e8c52e0bf0df8f4d54038674b5a75.tar nixpkgs-c64e9dadfe4e8c52e0bf0df8f4d54038674b5a75.tar.gz nixpkgs-c64e9dadfe4e8c52e0bf0df8f4d54038674b5a75.tar.bz2 nixpkgs-c64e9dadfe4e8c52e0bf0df8f4d54038674b5a75.tar.lz nixpkgs-c64e9dadfe4e8c52e0bf0df8f4d54038674b5a75.tar.xz nixpkgs-c64e9dadfe4e8c52e0bf0df8f4d54038674b5a75.tar.zst nixpkgs-c64e9dadfe4e8c52e0bf0df8f4d54038674b5a75.zip | |
Merge pull request #72742 from Avaq/avaq/twa-190
twa: 1.8.0 -> 1.9.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/twa/default.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index fe75b35eea2..b15b6dcba31 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , gawk , host +, jq , lib , makeWrapper , ncurses @@ -12,18 +13,25 @@ stdenv.mkDerivation rec { pname = "twa"; - version = "1.8.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "trailofbits"; repo = "twa"; rev = version; - sha256 = "1xq35xyz5536nwrwmlp1wqa7q9jgh90ly7vdy3a5rvxnksx0b2l5"; + sha256 = "1ab3bcyhfach9y15w8ffvqqan2qk8h62n6z8nqbgygi7n1mf6jzx"; }; dontBuild = true; - buildInputs = [ makeWrapper bash gawk curl netcat host.dnsutils ]; + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ bash + curl + gawk + host.dnsutils + jq + netcat ]; installPhase = '' install -Dm 0755 twa "$out/bin/twa" @@ -32,7 +40,11 @@ stdenv.mkDerivation rec { install -Dm 0644 README.md "$out/share/doc/twa/README.md" wrapProgram "$out/bin/twa" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ curl netcat ncurses host.dnsutils ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ curl + host.dnsutils + jq + ncurses + netcat ]} ''; meta = with lib; { |