diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-19 01:16:51 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-07-19 01:20:49 +0200 |
| commit | b5daad4268e487fdb2aaf2979667b56b99901bcd (patch) | |
| tree | 250fa1a069ede6ccffb953d0f42e28496213363a /pkgs/servers | |
| parent | febcd39afa6dff017290d3c56b7c545c8e05659b (diff) | |
| download | nixlib-b5daad4268e487fdb2aaf2979667b56b99901bcd.tar nixlib-b5daad4268e487fdb2aaf2979667b56b99901bcd.tar.gz nixlib-b5daad4268e487fdb2aaf2979667b56b99901bcd.tar.bz2 nixlib-b5daad4268e487fdb2aaf2979667b56b99901bcd.tar.lz nixlib-b5daad4268e487fdb2aaf2979667b56b99901bcd.tar.xz nixlib-b5daad4268e487fdb2aaf2979667b56b99901bcd.tar.zst nixlib-b5daad4268e487fdb2aaf2979667b56b99901bcd.zip | |
nginx: refactor and add mainline version
Upstream calls the unstable version mainline.
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/http/nginx/generic.nix (renamed from pkgs/servers/http/nginx/default.nix) | 6 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/mainline.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/mainline.upstream (renamed from pkgs/servers/http/nginx/unstable.upstream) | 0 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/stable.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/stable.upstream (renamed from pkgs/servers/http/nginx/default.upstream) | 0 |
5 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/generic.nix index 394a20420c73..6817f18bd1db 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -3,17 +3,17 @@ , withStream ? false , modules ? [] , hardening ? true +, version, sha256, ... }: with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { name = "nginx-${version}"; - version = "1.10.1"; src = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "00d8hxj8453c7989qd7z4f1mjp0k3ib8k29i1qyf11b4ar35ilqz"; + inherit sha256; }; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix new file mode 100644 index 000000000000..6e4c49abc5ba --- /dev/null +++ b/pkgs/servers/http/nginx/mainline.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }@args: + +callPackage ./generic.nix (args // { + version = "1.11.2"; + sha256 = "02khwad28ar2jjdfssysx262bgwgirm9967gnfhw9ga7wvipncm0"; +}) diff --git a/pkgs/servers/http/nginx/unstable.upstream b/pkgs/servers/http/nginx/mainline.upstream index 7bb025499592..7bb025499592 100644 --- a/pkgs/servers/http/nginx/unstable.upstream +++ b/pkgs/servers/http/nginx/mainline.upstream diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix new file mode 100644 index 000000000000..e677b181bb5d --- /dev/null +++ b/pkgs/servers/http/nginx/stable.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "1.10.1"; + sha256 = "00d8hxj8453c7989qd7z4f1mjp0k3ib8k29i1qyf11b4ar35ilqz"; +}) diff --git a/pkgs/servers/http/nginx/default.upstream b/pkgs/servers/http/nginx/stable.upstream index c20139017436..c20139017436 100644 --- a/pkgs/servers/http/nginx/default.upstream +++ b/pkgs/servers/http/nginx/stable.upstream |