diff options
Diffstat (limited to 'pkgs/servers/http/myserver/default.nix')
| -rw-r--r-- | pkgs/servers/http/myserver/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 776c121399e2..32526ddf65de 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -1,16 +1,17 @@ { fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls -, libxml2, zlib, guile, texinfo, cppunit, xz }: +, libxml2, zlib, guile, texinfo, cppunit, xz, psmisc }: -let version = "0.10"; in - stdenv.mkDerivation rec { +let version = "0.11"; in + stdenv.mkDerivation (rec { name = "myserver-${version}"; src = fetchurl { url = "mirror://gnu/myserver/${version}/${name}.tar.xz"; - sha256 = "0w8njgka54if8ycd9cyxgmqa0ivv7r0rka7gda3x2rfr2z4nxvpb"; + sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax"; }; - patches = [ ./disable-dns-lookup-in-chroot.patch ]; + patches = + [ ./disable-dns-lookup-in-chroot.patch ]; buildInputs = [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo xz ] @@ -42,3 +43,11 @@ let version = "0.10"; in platforms = stdenv.lib.platforms.gnu; }; } + + // + + # On GNU/Linux the `test_suite' process sometimes stays around, so + # forcefully terminate it. + (if stdenv.isLinux + then { postCheck = "${psmisc}/bin/killall test_suite || true"; } + else { })) |