diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index cb845220543b..c522f442e2f0 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -7,18 +7,15 @@ with stdenv.lib; -let +stdenv.mkDerivation rec { + name = "nginx-${version}"; version = "1.10.0"; - mainSrc = fetchurl { + + src = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; sha256 = "0kdyqa5xaxvhz6y75ixs05mzygk3kszzdq5h0gnlrg35vp1lgmlf"; }; -in - -stdenv.mkDerivation rec { - name = "nginx-${version}"; - src = mainSrc; buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip ] diff --git a/pkgs/servers/http/nginx/default.upstream b/pkgs/servers/http/nginx/default.upstream deleted file mode 100644 index c20139017436..000000000000 --- a/pkgs/servers/http/nginx/default.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url http://nginx.org/en/download.html -version_link '.*-([0-9]+[.][0-9]*[02468]([.][0-9]+)*)[.]tar[.][a-z0-9]*$' - -do_overwrite() { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index 5af882bac52b..a6ea3cdd58a0 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -7,19 +7,15 @@ with stdenv.lib; -let +stdenv.mkDerivation rec { + name = "nginx-${version}"; version = "1.9.14"; - mainSrc = fetchurl { + + src = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; sha256 = "1ljpyigqb6sbm4f8mi4fyvwfcvfapzg4z35s9cwb9ri8dl3r6j1b"; }; -in - -stdenv.mkDerivation rec { - name = "nginx-${version}"; - src = mainSrc; - buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip ] ++ concatMap (mod: mod.inputs or []) modules; diff --git a/pkgs/servers/http/nginx/unstable.upstream b/pkgs/servers/http/nginx/unstable.upstream deleted file mode 100644 index 7bb025499592..000000000000 --- a/pkgs/servers/http/nginx/unstable.upstream +++ /dev/null @@ -1,8 +0,0 @@ -url http://nginx.org/en/download.html -version_link '.*-([0-9]+[.][0-9]+([.][0-9]+)*)[.]tar[.][a-z0-9]*$' - -do_overwrite() { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -}