From b42eb45429a26cb900d8db2474a88058bf266e00 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 29 Jul 2013 07:38:59 +0200 Subject: [PATCH] thttpd: New package, version 2.25b. We already have mini_httpd, but IMHO it is *too* minimal as in not very flexible in configuration (for example, I haven't found any runtime configuration for disabling logging), so that's why I decided to add thttpd, which serves quite well as an ad-hoc HTTPd. Signed-off-by: aszlig --- pkgs/servers/http/thttpd/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/servers/http/thttpd/default.nix diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix new file mode 100644 index 00000000000..e03183cbe49 --- /dev/null +++ b/pkgs/servers/http/thttpd/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "thttpd-${version}"; + version = "2.25b"; + + src = fetchurl { + url = "http://acme.com/software/thttpd/${name}.tar.gz"; + sha256 = "0q13sfkh6amn5wk0ccbmxq3mnhlm8g5pnyk910fa5xngn449nw87"; + }; + + prePatch = '' + sed -i -e 's/getline/getlineX/' extras/htpasswd.c + ''; + + preInstall = '' + ensureDir "$out/man/man1" + sed -i -e 's/-o bin -g bin *//' Makefile + sed -i -e '/chgrp/d' extras/Makefile + ''; + + meta = { + description = "Tiny/turbo/throttling HTTP server"; + homepage = "http://www.acme.com/software/thttpd/"; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 43f0af27ab0..352d58393bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6103,6 +6103,8 @@ let }); squid = squids.squid31; # has ipv6 support + thttpd = callPackage ../servers/http/thttpd { }; + tomcat5 = callPackage ../servers/http/tomcat/5.0.nix { }; tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };