4 files changed, 38 insertions, 12 deletions
diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
index 96fd594aacb73..dbae8aad1427a 100644
--- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
+++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, apacheHttpd, jdk}:
 
 stdenv.mkDerivation {
-  name = "tomcat-connectors-1.2.31";
+  name = "tomcat-connectors-1.2.32";
   builder = ./builder.sh;
 
   src = fetchurl {
-    url = http://apache.hippo.nl//tomcat/tomcat-connectors/jk/source/jk-1.2.31/tomcat-connectors-1.2.31-src.tar.gz;
-    sha256 = "0604mcxj7zdzdl2f8krpj8ig1r5qkga3hia28pijdpvy9n6pxij8";
+    url = http://apache.xl-mirror.nl//tomcat/tomcat-connectors/jk/tomcat-connectors-1.2.32-src.tar.gz;
+    sha256 = "1dim62warzy1hqvc7cvnqsbq475sr6vpgwd6gfmddmkgw155saji";
   };
 
   inherit apacheHttpd;
diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix
new file mode 100644
index 0000000000000..a6ae56b653411
--- /dev/null
+++ b/pkgs/servers/http/mini-httpd/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, boost }:
+
+stdenv.mkDerivation {
+  name = "mini-httpd-1.1";
+
+  src = fetchurl {
+    url = "mirror://savannah/mini-httpd/mini-httpd-1.1.tar.gz";
+    sha256 = "12hqvh67hgxmc9b3fhb8gb5ash7j6f7d0mxv47zkmjl7k3vw3ny7";
+  };
+
+  buildInputs = [ boost ];
+
+  meta = {
+    homepage = "http://mini-httpd.nongnu.org/";
+    description = "a minimalistic high-performance web server";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
+}
diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix
index 0b2c971e6e54f..32526ddf65de4 100644
--- a/pkgs/servers/http/myserver/default.nix
+++ b/pkgs/servers/http/myserver/default.nix
@@ -1,17 +1,17 @@
 { fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls
 , libxml2, zlib, guile, texinfo, cppunit, xz, psmisc }:
 
-let version = "0.10"; in
+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 ./installable-binary.patch ];
+      [ ./disable-dns-lookup-in-chroot.patch ];
 
     buildInputs =
       [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo xz ]
diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix
index aa7e5e63cda50..c47449ce6bd74 100644
--- a/pkgs/servers/http/redstore/default.nix
+++ b/pkgs/servers/http/redstore/default.nix
@@ -1,15 +1,21 @@
-{ stdenv, fetchurl, redland, pkgconfig, gmp }:
+{ stdenv, fetchurl, redland, pkgconfig, gmp, zlib, librdf_raptor2
+  , librdf_rasqal }:
 
 stdenv.mkDerivation rec {
-  name = "redstore-0.4";
+  name = "redstore-0.5.2";
 
   src = fetchurl {
-    url = "http://redstore.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1fs54v0d0kkqaz9ajacabb8wifrglvg6kkhd5b0mxmnng352wpp7";
+    url = "http://www.aelius.com/njh/redstore/${name}.tar.gz";
+    sha256 = "fdbe499a7bbe8c8a756ecb738b83ea375e96af16a1d74245b75600d4d40adb7d";
   };
 
-  buildInputs = [ gmp pkgconfig redland ];
-      
+  buildInputs = [ gmp pkgconfig redland zlib librdf_raptor2 librdf_rasqal ];
+     
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${librdf_raptor2}/include/raptor2"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${librdf_rasqal}/include/rasqal"
+  '';
+
   meta = {
     description = "An HTTP interface to Redland RDF store";
     maintainers = [ stdenv.lib.maintainers.raskin ];