Merge pull request #138456 from NixOS/backport-138430-to-release-21.05

[Backport release-21.05] atftp: 0.7.4 -> 0.7.5, enable tests
This commit is contained in:
Michael Raskin 2021-09-19 08:51:30 +00:00 committed by GitHub
commit 317f0270aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,21 +1,27 @@
{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc, ps }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "atftp"; pname = "atftp";
version = "0.7.4"; version = "0.7.5";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/atftp/${pname}-${version}.tar.gz";
sha256 = "sha256-08nNDZcd/Hhtel9AVcNdTmaq/IECrANHPvIlvfftsmo="; sha256 = "12h3sgkd25j4nfagil2jqyj1n8yxvaawj0cf01742642n57pmj4k";
}; };
# fix test script
postPatch = ''
patchShebangs .
'';
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ readline tcp_wrappers pcre gcc ]; buildInputs = [ readline tcp_wrappers pcre gcc ];
# Expects pre-GCC5 inline semantics # Expects pre-GCC5 inline semantics
NIX_CFLAGS_COMPILE = "-std=gnu89"; NIX_CFLAGS_COMPILE = "-std=gnu89";
doCheck = false; # fails doCheck = true;
checkInputs = [ ps ];
meta = { meta = {
description = "Advanced tftp tools"; description = "Advanced tftp tools";