diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-19 10:37:02 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-19 10:37:02 +0000 |
| commit | 203846b9de3bc67e77c93be9d111408286a17d5d (patch) | |
| tree | 3306a68a635fad0de834440c25f7e1b69b1e4b10 /pkgs/servers/http | |
| parent | 6539901c7f5eeb18cf5e9a493c230a912ff27f82 (diff) | |
| parent | b54009fdfb7951bb5423c4fabcb28b70581b5ba8 (diff) | |
| download | nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.gz nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.bz2 nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.lz nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.xz nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.zst nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/servers/http')
| -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 bf8abd2c027..b1d70907e28 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 00000000000..6e4c49abc5b --- /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 7bb02549959..7bb02549959 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 00000000000..e677b181bb5 --- /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 c2013901743..c2013901743 100644 --- a/pkgs/servers/http/nginx/default.upstream +++ b/pkgs/servers/http/nginx/stable.upstream |