Author: rob Date: Mon Oct 31 18:26:20 2011 New Revision: 30144 URL: https://nixos.org/websvn/nix/?rev=30144&sc=1
Log: update nginx to 1.1.7 Deleted: nixpkgs/trunk/pkgs/servers/http/nginx/src-for-default.nix nixpkgs/trunk/pkgs/servers/http/nginx/src-info-for-default.nix Modified: nixpkgs/trunk/pkgs/servers/http/nginx/default.nix nixpkgs/trunk/pkgs/top-level/all-packages.nix Modified: nixpkgs/trunk/pkgs/servers/http/nginx/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/servers/http/nginx/default.nix Mon Oct 31 14:44:32 2011 (r30143) +++ nixpkgs/trunk/pkgs/servers/http/nginx/default.nix Mon Oct 31 18:26:20 2011 (r30144) @@ -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 @@ # "--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; }; } Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix ============================================================================== --- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Oct 31 14:44:32 2011 (r30143) +++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Oct 31 18:26:20 2011 (r30144) @@ -4929,9 +4929,7 @@ 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 { }; _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits