lol

tftp-hpa: reimplement using mkDerivation

Also rename top-level name to tftp-hpa.

+19 -40
+14 -38
pkgs/tools/networking/tftp-hpa/default.nix
··· 1 - x@{builderDefsPackage 2 - , tcp_wrappers 3 - , ...}: 4 - builderDefsPackage 5 - (a : 6 - let 7 - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 8 - []; 1 + { stdenv, fetchurl, tcp_wrappers }: 9 2 10 - buildInputs = map (n: builtins.getAttr n x) 11 - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); 12 - sourceInfo = rec { 13 - baseName="tftp-hpa"; 14 - version="5.2"; 15 - name="${baseName}-${version}"; 16 - url="mirror://kernel/software/network/tftp/tftp-hpa/${name}.tar.xz"; 17 - hash="afee361df96a2f88344e191f6a25480fd714e1d28d176c3f10cc43fa206b718b"; 18 - }; 19 - in 20 - rec { 21 - src = a.fetchurl { 22 - url = sourceInfo.url; 23 - sha256 = sourceInfo.hash; 3 + stdenv.mkDerivation rec { 4 + name = "tftp-hpa-${version}"; 5 + version="5.2"; 6 + src = fetchurl { 7 + url = "mirror://kernel/software/network/tftp/tftp-hpa/${name}.tar.xz"; 8 + sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg"; 24 9 }; 25 10 26 - inherit (sourceInfo) name version; 27 - inherit buildInputs; 28 - 29 - /* doConfigure should be removed if not needed */ 30 - phaseNames = ["doConfigure" "doMakeInstall"]; 31 - 32 - meta = { 11 + meta = with stdenv.lib; { 33 12 description = "TFTP tools - a lot of fixes on top of BSD TFTP"; 34 - maintainers = with a.lib.maintainers; 35 - [ 36 - raskin 37 - ]; 38 - platforms = with a.lib.platforms; 39 - linux; 40 - license = a.lib.licenses.bsd3; 13 + maintainers = with maintainers; [ raskin ]; 14 + platforms = with platforms; linux; 15 + license = licenses.bsd3; 16 + homepage = http://www.kernel.org/pub/software/network/tftp/; 41 17 }; 18 + 42 19 passthru = { 43 20 updateInfo = { 44 21 downloadPage = "http://www.kernel.org/pub/software/network/tftp/"; 45 22 }; 46 23 }; 47 - }) x 48 - 24 + }
+5 -2
pkgs/top-level/all-packages.nix
··· 3393 3393 3394 3394 rcm = callPackage ../tools/misc/rcm {}; 3395 3395 3396 - tftp_hpa = callPackage ../tools/networking/tftp-hpa {}; 3396 + tftp-hpa = callPackage ../tools/networking/tftp-hpa {}; 3397 3397 3398 3398 tidy-html5 = callPackage ../tools/text/tidy-html5 { }; 3399 3399 ··· 6354 6354 6355 6355 freeglut = callPackage ../development/libraries/freeglut { }; 6356 6356 6357 - freenect = callPackage ../development/libraries/freenect { }; 6357 + freenect = callPackage ../development/libraries/freenect { 6358 + inherit (xlibs) libXi libXmu; 6359 + }; 6358 6360 6359 6361 freetype = callPackage ../development/libraries/freetype { }; 6360 6362 ··· 15604 15606 youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07 15605 15607 youtubeDL = youtube-dl; # added 2014-10-26 15606 15608 pidginlatexSF = pidginlatex; # added 2014-11-02 15609 + tftp_hpa = tftp-hpa; # added 2015-04-03 15607 15610 }; 15608 15611 15609 15612 tweakAlias = _n: alias: with lib;