atftp: 0.7 -> 0.7.1

This commit is contained in:
Tuomas Tynkkynen 2016-07-21 07:21:01 +03:00
parent 26008f28b8
commit 212dd434ec
2 changed files with 12 additions and 25 deletions

View File

@ -1,34 +1,23 @@
{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }:
assert stdenv.isLinux;
assert stdenv.cc.isGNU; stdenv.mkDerivation rec {
let
version = "0.7";
debianPatch = fetchurl {
url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg-11.diff.gz";
sha256 = "07g4qbmp0lnscg2dkj6nsj657jaghibvfysdm1cdxcn215n3zwqd";
};
in
stdenv.mkDerivation {
name = "atftp-${version}"; name = "atftp-${version}";
inherit version; version = "0.7.1";
src = fetchurl { src = fetchurl {
url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; url = "mirror://sourceforge/atftp/${name}.tar.gz";
sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q"; sha256 = "0bgr31gbnr3qx4ixf8hz47l58sh3367xhcnfqd8233fvr84nyk5f";
}; };
buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ]; buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ];
patches = [ debianPatch ];
postInstall = '' # Expects pre-GCC5 inline semantics
wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc.lib}/lib${if stdenv.system == "x86_64-linux" then "64" else ""} NIX_CFLAGS_COMPILE = "-std=gnu89";
'';
meta = { meta = {
description = "Advanced tftp tools"; description = "Advanced tftp tools";
maintainers = [ lib.maintainers.raskin ]; maintainers = [ lib.maintainers.raskin ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
license = lib.licenses.gpl2Plus; license = lib.licenses.gpl2Plus;
passthru = {
updateInfo = {
downloadPage = "http://packages.debian.org/source/wheezy/atftp";
};
}; };
};
} }

View File

@ -517,9 +517,7 @@ in
at = callPackage ../tools/system/at { }; at = callPackage ../tools/system/at { };
atftp = callPackage ../tools/networking/atftp { atftp = callPackage ../tools/networking/atftp { };
gcc = gcc49;
};
autogen = callPackage ../development/tools/misc/autogen { }; autogen = callPackage ../development/tools/misc/autogen { };