diff options
| author | Aldwin Vlasblom <aldwin@avaq.it> | 2019-11-03 21:07:46 +0100 |
|---|---|---|
| committer | Aldwin Vlasblom <aldwin@avaq.it> | 2019-11-11 16:25:34 +0100 |
| commit | 776d4c13acdaacc8e5497addf1ade153604a69c6 (patch) | |
| tree | 2ec25944e019a497ac20c9ee813ad80713476f9c /pkgs | |
| parent | 7c4f09f695b475b11ef07020418ebd68698b1561 (diff) | |
| download | nixpkgs-776d4c13acdaacc8e5497addf1ade153604a69c6.tar nixpkgs-776d4c13acdaacc8e5497addf1ade153604a69c6.tar.gz nixpkgs-776d4c13acdaacc8e5497addf1ade153604a69c6.tar.bz2 nixpkgs-776d4c13acdaacc8e5497addf1ade153604a69c6.tar.lz nixpkgs-776d4c13acdaacc8e5497addf1ade153604a69c6.tar.xz nixpkgs-776d4c13acdaacc8e5497addf1ade153604a69c6.tar.zst nixpkgs-776d4c13acdaacc8e5497addf1ade153604a69c6.zip | |
twa: 1.8.0 -> 1.9.1
This commit updates twa from version 1.8.0 to version 1.9.1, specifying its new 'jq' dependency. It also moves 'makeWrapper' from the build inputs to the native build inputs, as it's not necessary during runtime.
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; { |