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.
This commit is contained in:
@@ -4,6 +4,7 @@
|
|||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, gawk
|
, gawk
|
||||||
, host
|
, host
|
||||||
|
, jq
|
||||||
, lib
|
, lib
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, ncurses
|
, ncurses
|
||||||
@@ -12,18 +13,25 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "twa";
|
pname = "twa";
|
||||||
version = "1.8.0";
|
version = "1.9.1";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "trailofbits";
|
owner = "trailofbits";
|
||||||
repo = "twa";
|
repo = "twa";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "1xq35xyz5536nwrwmlp1wqa7q9jgh90ly7vdy3a5rvxnksx0b2l5";
|
sha256 = "1ab3bcyhfach9y15w8ffvqqan2qk8h62n6z8nqbgygi7n1mf6jzx";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
buildInputs = [ makeWrapper bash gawk curl netcat host.dnsutils ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
buildInputs = [ bash
|
||||||
|
curl
|
||||||
|
gawk
|
||||||
|
host.dnsutils
|
||||||
|
jq
|
||||||
|
netcat ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
install -Dm 0755 twa "$out/bin/twa"
|
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"
|
install -Dm 0644 README.md "$out/share/doc/twa/README.md"
|
||||||
|
|
||||||
wrapProgram "$out/bin/twa" \
|
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; {
|
meta = with lib; {
|
||||||
|
|||||||
Reference in New Issue
Block a user