From 88bf350b1d3de0f3d674b699b372f4366b95dcbf Mon Sep 17 00:00:00 2001 From: 7c6f434c <7c6f434c@mail.ru> Date: Tue, 31 Dec 2024 17:31:26 +0100 Subject: [PATCH] tftp-hpa: 5.2 -> 5.2-untagged-2024-06-10 --- pkgs/by-name/tf/tftp-hpa/package.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/tf/tftp-hpa/package.nix b/pkgs/by-name/tf/tftp-hpa/package.nix index f9946be7423a..8a41255c8398 100644 --- a/pkgs/by-name/tf/tftp-hpa/package.nix +++ b/pkgs/by-name/tf/tftp-hpa/package.nix @@ -1,15 +1,18 @@ { lib, stdenv, - fetchurl, + fetchgit, + autoconf, + automake, }: stdenv.mkDerivation rec { pname = "tftp-hpa"; - version = "5.2"; - src = fetchurl { - url = "mirror://kernel/software/network/tftp/tftp-hpa/${pname}-${version}.tar.xz"; - sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg"; + version = "5.2-untagged-2024-06-10"; + src = fetchgit { + url = "git://git.kernel.org/pub/scm/network/tftp/tftp-hpa.git"; + hash = "sha256-lTMldYO/cZdLj0UjOPPBHfYf2GBG0O+5lhP9ikqn3tY="; + rev = "2c86ff58dcc003107b47f2d35aa0fdc4a3fd95e1"; }; # Workaround build failure on -fno-common toolchains like upstream @@ -18,6 +21,15 @@ stdenv.mkDerivation rec { # `toplevel'; tftp.o:/build/tftp-hpa-5.2/tftp/tftp.c:51: first defined here env.NIX_CFLAGS_COMPILE = "-fcommon"; + preConfigure = '' + ./autogen.sh + ''; + + nativeBuildInputs = [ + autoconf + automake + ]; + meta = with lib; { description = "TFTP tools - a lot of fixes on top of BSD TFTP"; maintainers = with maintainers; [ raskin ];