JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nginx: remove .upstream files

Browse Source
This commit is contained in:
Tobias Geerinckx-Rice 2016-05-06 10:34:37 +02:00
parent 8729bd8bb9
commit 07d9de713a
No known key found for this signature in database
GPG Key ID: 91CCDB9B48541B99
4 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/servers/http/nginx/default.nix
View File

@ -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 ]

8
pkgs/servers/http/nginx/default.upstream
View File

@ -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"
}

12
pkgs/servers/http/nginx/unstable.nix
View File

@ -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;

8
pkgs/servers/http/nginx/unstable.upstream
View File

@ -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"
}