Author: ludo
Date: Tue Oct 19 08:09:41 2010
New Revision: 24359
URL: https://svn.nixos.org/websvn/nix/?rev=24359&sc=1
Log:
GNU MyServer 0.10.
Added:
nixpkgs/trunk/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch
Deleted:
nixpkgs/trunk/pkgs/servers/http/myserver/tests-in-chroot.patch
Modified:
nixpkgs/trunk/pkgs/servers/http/myserver/default.nix
Modified: nixpkgs/trunk/pkgs/servers/http/myserver/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/servers/http/myserver/default.nix Tue Oct 19
08:09:35 2010 (r24358)
+++ nixpkgs/trunk/pkgs/servers/http/myserver/default.nix Tue Oct 19
08:09:41 2010 (r24359)
@@ -1,22 +1,27 @@
{ fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls
-, libxml2, zlib, texinfo, cppunit, xz }:
+, libxml2, zlib, guile, texinfo, cppunit, xz }:
-let version = "0.9.2"; in
+let version = "0.10"; in
stdenv.mkDerivation rec {
name = "myserver-${version}";
src = fetchurl {
url = "mirror://gnu/myserver/${version}/${name}.tar.xz";
- sha256 = "110001ssyrvmvqrkxbz09a5m945ahh478v1l7aq31gh1l9j0cf6n";
+ sha256 = "0w8njgka54if8ycd9cyxgmqa0ivv7r0rka7gda3x2rfr2z4nxvpb";
};
- patches = [ ./tests-in-chroot.patch ];
+ patches = [ ./disable-dns-lookup-in-chroot.patch ];
- buildInputs = [ libgcrypt libevent libidn gnutls libxml2 zlib texinfo xz ]
+ buildInputs =
+ [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo xz ]
++ stdenv.lib.optional doCheck cppunit;
+ makeFlags = [ "V=1" ];
+
doCheck = true;
+ enableParallelBuilding = true;
+
meta = {
description = "GNU MyServer, a powerful and easy to configure web
server";
Added:
nixpkgs/trunk/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/servers/http/myserver/disable-dns-lookup-in-chroot.patch
Tue Oct 19 08:09:41 2010 (r24359)
@@ -0,0 +1,12 @@
+Disable this test because it attempts to do a DNS lookup, which fails
+in a chroot.
+
+--- myserver-0.10/tests/test_socket.cpp 2010-10-19 00:12:59.000000000
+0200
++++ myserver-0.10/tests/test_socket.cpp 2010-10-19 00:13:07.000000000
+0200
+@@ -56,7 +56,6 @@ class TestSocket : public CppUnit::TestF
+
+ CPPUNIT_TEST (testGethostname);
+ CPPUNIT_TEST (testRecv);
+- CPPUNIT_TEST (testGetLocalIPsList);
+
+ CPPUNIT_TEST_SUITE_END ();
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
