BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tftp-hpa: reimplement using mkDerivation

Browse source 
Also rename top-level name to tftp-hpa.
This commit is contained in:
Joachim Fasting 2015-04-20 12:05:04 +02:00
parent 5ddd4812a9
commit 6812c1eedc
2 changed files with 19 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
pkgs/tools/networking/tftp-hpa/default.nix
View file

@ -1,48 +1,24 @@
x@{builderDefsPackage
, tcp_wrappers
, ...}:
builderDefsPackage
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
{ stdenv, fetchurl, tcp_wrappers }:
buildInputs = map (n: builtins.getAttr n x)
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="tftp-hpa";
version="5.2";
name="${baseName}-${version}";
url="mirror://kernel/software/network/tftp/tftp-hpa/${name}.tar.xz";
hash="afee361df96a2f88344e191f6a25480fd714e1d28d176c3f10cc43fa206b718b";
};
in
rec {
src = a.fetchurl {
url = sourceInfo.url;
sha256 = sourceInfo.hash;
stdenv.mkDerivation rec {
name = "tftp-hpa-${version}";
version="5.2";
src = fetchurl {
url = "mirror://kernel/software/network/tftp/tftp-hpa/${name}.tar.xz";
sha256 = "12vidchglhyc20znq5wdsbhi9mqg90jnl7qr9qs8hbvaz4fkdvmg";
};
inherit (sourceInfo) name version;
inherit buildInputs;
/* doConfigure should be removed if not needed */
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
meta = with stdenv.lib; {
description = "TFTP tools - a lot of fixes on top of BSD TFTP";
maintainers = with a.lib.maintainers;
[
raskin
];
platforms = with a.lib.platforms;
linux;
license = a.lib.licenses.bsd3;
maintainers = with maintainers; [ raskin ];
platforms = with platforms; linux;
license = licenses.bsd3;
homepage = http://www.kernel.org/pub/software/network/tftp/;
};
passthru = {
updateInfo = {
downloadPage = "http://www.kernel.org/pub/software/network/tftp/";
};
};
}) x
}

7
pkgs/top-level/all-packages.nix
View file

@ -3393,7 +3393,7 @@ let
rcm = callPackage ../tools/misc/rcm {};
tftp_hpa = callPackage ../tools/networking/tftp-hpa {};
tftp-hpa = callPackage ../tools/networking/tftp-hpa {};
tidy-html5 = callPackage ../tools/text/tidy-html5 { };
@ -6354,7 +6354,9 @@ let
freeglut = callPackage ../development/libraries/freeglut { };
freenect = callPackage ../development/libraries/freenect { };
freenect = callPackage ../development/libraries/freenect {
inherit (xlibs) libXi libXmu;
};
freetype = callPackage ../development/libraries/freetype { };
@ -15604,6 +15606,7 @@ aliases = with self; rec {
youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
youtubeDL = youtube-dl; # added 2014-10-26
pidginlatexSF = pidginlatex; # added 2014-11-02
tftp_hpa = tftp-hpa; # added 2015-04-03
};
tweakAlias = _n: alias: with lib;