update nginx to 1.1.7

svn path=/nixpkgs/trunk/; revision=30144

pkgs/servers/http/nginx/default.nix

@@ -1,15 +1,12 @@
-a :  
-let 
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    openssl zlib pcre libxml2 libxslt
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
+{ stdenv, fetchurl, openssl, zlib, pcre, libxml2, libxslt }:
+stdenv.mkDerivation rec {
+  name = "nginx-1.1.7";
+  src = fetchurl {
+    url = "http://nginx.org/download/${name}.tar.gz";
+    sha256 = "1y0bzmrgnyqw8ghc508nipy5k46byrxc2sycqp35fdx0jmjz3h51";
+  };
+  buildInputs = [ openssl zlib pcre libxml2 libxslt ];
 
-  inherit (s) name;
-  inherit buildInputs;
   configureFlags = [
     "--with-http_ssl_module"
     "--with-http_xslt_module"
@@ -21,18 +18,16 @@ rec {
     # "--with-http_perl_module" 
   ];
 
-  preConfigure = a.fullDepEntry ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libxml2}/include/libxml2"
-  '' [];
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2"
+  '';
 
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
-      
   meta = {
     description = "nginx - 'engine x' - reverse proxy and lightweight webserver";
     maintainers = [
-      a.lib.maintainers.raskin
+      stdenv.lib.maintainers.raskin
     ];
-    platforms = with a.lib.platforms; 
+    platforms = with stdenv.lib.platforms; 
       all;
   };
 }

pkgs/servers/http/nginx/src-for-default.nix

@@ -1,9 +0,0 @@
-rec {
-   version="1.0.0";
-   name="nginx-1.0.0";
-   hash="00f0fjkdqi0xl1kcg6d91zmvj82n8w1znp5w9v152rymxv5ddqrx";
-   url="http://sysoev.ru/nginx/nginx-${version}.tar.gz";
-   advertisedUrl="http://sysoev.ru/nginx/nginx-1.0.0.tar.gz";
-  
-  
-}

pkgs/servers/http/nginx/src-info-for-default.nix

@@ -1,4 +0,0 @@
-{
-  downloadPage = "http://sysoev.ru/nginx/download.html";
-  baseName = "nginx";
-}

pkgs/top-level/all-packages.nix

@@ -4929,9 +4929,7 @@ let
 
   myserver = callPackage ../servers/http/myserver { };
 
-  nginx = builderDefsPackage (import ../servers/http/nginx) {
-    inherit openssl pcre zlib libxml2 libxslt;
-  };
+  nginx = callPackage ../servers/http/nginx { };
 
   postfix = callPackage ../servers/mail/postfix { };