From 108423388944d94a080fc5f04f213777f78f11b1 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 18 Sep 2021 15:52:37 +0100 Subject: [PATCH 1/2] atftp: 0.7.4 -> 0.7.5 --- pkgs/tools/networking/atftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 0e76cb94346b..a94612447361 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atftp"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz"; - sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo="; + sha256 = "12h3sgkd25j4nfagil2jqyj1n8yxvaawj0cf01742642n57pmj4k"; }; nativeBuildInputs = [ makeWrapper ]; From 70da17646624c7d24daacc644c3c870a938b2f94 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 18 Sep 2021 15:52:54 +0100 Subject: [PATCH 2/2] atftp: enable tests --- pkgs/tools/networking/atftp/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index a94612447361..ca06afe7bdbf 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: +{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc, ps }: stdenv.mkDerivation rec { pname = "atftp"; @@ -9,13 +9,19 @@ stdenv.mkDerivation rec { sha256 = "12h3sgkd25j4nfagil2jqyj1n8yxvaawj0cf01742642n57pmj4k"; }; + # fix test script + postPatch = '' + patchShebangs . + ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ readline tcp_wrappers pcre gcc ]; # Expects pre-GCC5 inline semantics NIX_CFLAGS_COMPILE = "-std=gnu89"; - doCheck = false; # fails + doCheck = true; + checkInputs = [ ps ]; meta = { description = "Advanced tftp tools";