From 82b5887cab2f52aaea4f5f63e05f695af5730769 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 2 Oct 2018 11:10:58 -0700 Subject: [PATCH 1/2] twa: 1.3.1 -> 1.5.1 --- pkgs/tools/networking/twa/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index f8004ad0068..ba7f0669f37 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -1,19 +1,28 @@ -{ stdenv, fetchFromGitHub, makeWrapper, bash, gawk, curl, netcat, ncurses }: +{ stdenv +, bash +, host +, curl +, fetchFromGitHub +, gawk +, makeWrapper +, ncurses +, netcat +}: stdenv.mkDerivation rec { name = "twa-${version}"; - version = "1.3.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "trailofbits"; repo = "twa"; rev = version; - sha256 = "16x9nzsrf10waqmjm423vx44820c6mls7gxc8azrdqnz18vdy1h4"; + sha256 = "14pwiq1kza92w2aq358zh5hrxpxpfhg31am03b56g6vlvqzsvib7"; }; dontBuild = true; - buildInputs = [ makeWrapper bash gawk curl netcat ]; + buildInputs = [ makeWrapper bash gawk curl netcat host.dnsutils ]; installPhase = '' install -Dm 0755 twa "$out/bin/twa" @@ -22,7 +31,7 @@ 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 ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ curl netcat ncurses host.dnsutils ]} ''; meta = { From 9b08685e9645d0a0c1ff66fcd73a4a57654eb5c6 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 2 Oct 2018 11:30:31 -0700 Subject: [PATCH 2/2] twa: set meta.platforms to platforms.unix --- pkgs/tools/networking/twa/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index ba7f0669f37..8e9a88ad6f9 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -1,9 +1,10 @@ { stdenv , bash -, host , curl , fetchFromGitHub , gawk +, host +, lib , makeWrapper , ncurses , netcat @@ -34,10 +35,11 @@ stdenv.mkDerivation rec { --prefix PATH : ${stdenv.lib.makeBinPath [ curl netcat ncurses host.dnsutils ]} ''; - meta = { + meta = with lib; { description = "A tiny web auditor with strong opinions"; homepage = https://github.com/trailofbits/twa; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ avaq ]; + license = licenses.mit; + maintainers = with maintainers; [ avaq ]; + platforms = platforms.unix; }; }