diff options
| -rw-r--r-- | pkgs/tools/networking/atftp/default.nix | 33 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 12 insertions, 25 deletions
diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index bd4fb7e9e6af..23355d61bea8 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,34 +1,23 @@ { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper, gcc }: -assert stdenv.isLinux; -assert stdenv.cc.isGNU; -let -version = "0.7"; -debianPatch = fetchurl { - url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg-11.diff.gz"; - sha256 = "07g4qbmp0lnscg2dkj6nsj657jaghibvfysdm1cdxcn215n3zwqd"; -}; -in -stdenv.mkDerivation { + +stdenv.mkDerivation rec { name = "atftp-${version}"; - inherit version; + version = "0.7.1"; + src = fetchurl { - url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; - sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q"; + url = "mirror://sourceforge/atftp/${name}.tar.gz"; + sha256 = "0bgr31gbnr3qx4ixf8hz47l58sh3367xhcnfqd8233fvr84nyk5f"; }; + buildInputs = [ readline tcp_wrappers pcre makeWrapper gcc ]; - patches = [ debianPatch ]; - postInstall = '' - wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.cc.lib}/lib${if stdenv.system == "x86_64-linux" then "64" else ""} - ''; + + # Expects pre-GCC5 inline semantics + NIX_CFLAGS_COMPILE = "-std=gnu89"; + meta = { description = "Advanced tftp tools"; maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; - passthru = { - updateInfo = { - downloadPage = "http://packages.debian.org/source/wheezy/atftp"; - }; }; -}; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a0f4a5adffa..ce31a6e902c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -517,9 +517,7 @@ in at = callPackage ../tools/system/at { }; - atftp = callPackage ../tools/networking/atftp { - gcc = gcc49; - }; + atftp = callPackage ../tools/networking/atftp { }; autogen = callPackage ../development/tools/misc/autogen { }; |