From ead1e597bedf1c8d1fde1003f345578b675dfd19 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Thu, 27 Mar 2025 00:50:05 +0100 Subject: [PATCH 1/2] netkittftp: fix compilation --- pkgs/by-name/ne/netkittftp/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ne/netkittftp/package.nix b/pkgs/by-name/ne/netkittftp/package.nix index 077438c0e4e7..08b549b319ff 100644 --- a/pkgs/by-name/ne/netkittftp/package.nix +++ b/pkgs/by-name/ne/netkittftp/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, }: stdenv.mkDerivation rec { @@ -17,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs"; }; + patches = [ + # fix compilation errors, warning and many style issues + (fetchpatch { + url = "https://sources.debian.org/data/main/n/netkit-tftp/0.17-23/debian/patches/debian_changes_0.17-18.patch"; + hash = "sha256-kprmSMoNF6E8GGRIPWDLWcqfPRxdUeheeLoFNqI3Uv0="; + }) + ]; + preInstall = " mkdir -p $out/man/man{1,8} $out/sbin $out/bin "; From e540c3eeb5a9bbb2506daaefb5226365facd9f3d Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Thu, 27 Mar 2025 00:50:19 +0100 Subject: [PATCH 2/2] netkittftp: modernize --- pkgs/by-name/ne/netkittftp/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/ne/netkittftp/package.nix b/pkgs/by-name/ne/netkittftp/package.nix index 08b549b319ff..5bbeedc323b5 100644 --- a/pkgs/by-name/ne/netkittftp/package.nix +++ b/pkgs/by-name/ne/netkittftp/package.nix @@ -5,17 +5,17 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "netkit-tftp"; version = "0.17"; src = fetchurl { urls = [ - "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz" - "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${version}.tar.gz" - "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_${version}.orig.tar.gz" + "mirror://ubuntu/pool/universe/n/netkit-tftp/netkit-tftp_${finalAttrs.version}.orig.tar.gz" + "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-tftp-${finalAttrs.version}.tar.gz" + "https://ftp.cc.uoc.gr/mirrors/linux/ubuntu/packages/pool/universe/n/netkit-tftp/netkit-tftp_${finalAttrs.version}.orig.tar.gz" ]; - sha256 = "0kfibbjmy85r3k92cdchha78nzb6silkgn1zaq9g8qaf1l0w0hrs"; + hash = "sha256-OkPAAQ1OYfQSVj/YN2nUZn2LjoKQNSbSHLkgX+Va0U0="; }; patches = [ @@ -37,4 +37,4 @@ stdenv.mkDerivation rec { maintainers = [ ]; platforms = with lib.platforms; linux; }; -} +})