diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2016-05-06 10:34:37 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2016-05-06 13:47:12 +0200 |
| commit | 07d9de713a1789b90f4153ca82afafc3a8ea1b87 (patch) | |
| tree | d1904f083bdc6044ebe34e2bf3006dc3fe3947f1 | |
| parent | 8729bd8bb99ee47abb788590eb6a9260fbdc64ca (diff) | |
| download | nixpkgs-07d9de713a1789b90f4153ca82afafc3a8ea1b87.tar nixpkgs-07d9de713a1789b90f4153ca82afafc3a8ea1b87.tar.gz nixpkgs-07d9de713a1789b90f4153ca82afafc3a8ea1b87.tar.bz2 nixpkgs-07d9de713a1789b90f4153ca82afafc3a8ea1b87.tar.lz nixpkgs-07d9de713a1789b90f4153ca82afafc3a8ea1b87.tar.xz nixpkgs-07d9de713a1789b90f4153ca82afafc3a8ea1b87.tar.zst nixpkgs-07d9de713a1789b90f4153ca82afafc3a8ea1b87.zip | |
nginx: remove .upstream files
| -rw-r--r-- | pkgs/servers/http/nginx/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/default.upstream | 8 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/unstable.nix | 12 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/unstable.upstream | 8 |
4 files changed, 8 insertions, 31 deletions
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index cb845220543..c522f442e2f 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 c2013901743..00000000000 --- 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 5af882bac52..a6ea3cdd58a 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 7bb02549959..00000000000 --- 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" -} |