diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-18 10:41:34 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-11-18 10:41:34 +0100 |
| commit | 0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4 (patch) | |
| tree | 1d8b73f5d799dc62efc56a181012abc3e8062c19 /pkgs/servers/http | |
| parent | 0a085d508ac054e45dfe0a7f24d55b29ca9d4ae9 (diff) | |
| parent | 3aa6b8ccc5ad930803e7beb9492f88f6df2c1fdb (diff) | |
| download | nixpkgs-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar nixpkgs-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.gz nixpkgs-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.bz2 nixpkgs-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.lz nixpkgs-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.xz nixpkgs-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.tar.zst nixpkgs-0d0d7dcd06a01bb9ab8f17ee15efd0334677eec4.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apache-modules/mod_wsgi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/hiawatha/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/mainline.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/stable.nix | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 948ef345e10..19a9be8e86e 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mod_wsgi-${version}"; - version = "4.6.4"; + version = "4.6.5"; src = fetchurl { url = "https://github.com/GrahamDumpleton/mod_wsgi/archive/${version}.tar.gz"; - sha256 = "1hyaxr9km7cj4k6b0d6xx3bplpa8483fhyk9x802sl22m3f2vc1k"; + sha256 = "1q75ifadjd5frr5i2b9swbjiwfv4fr4ny8npsm09w6mjp7w0bgjw"; }; buildInputs = [ apacheHttpd python2 ]; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index e10799e27f8..d99a04642de 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { name = "hiawatha-${version}"; - version = "10.8.1"; + version = "10.8.3"; src = fetchFromGitLab { owner = "hsleisink"; repo = "hiawatha"; rev = "v${version}"; - sha256 = "1428byx0xpzzwyc0j157q70sjx18dykvg6fd5vp70kj85ank0xpa"; + sha256 = "057kglz5grrxg5m2brr7mcncwd3idxzczq5vg8yd1iri2rq63hdc"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index f830f0acee3..93dfbbad2b4 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.15.5"; - sha256 = "0vxfbnc1794al60d9mhjw1w72x5jslfwq51vvs38568liyd8hfhs"; + version = "1.15.6"; + sha256 = "1ikchbnq1dv8wjnsf6jj24xkb36vcgigyps71my8r01m41ycdn53"; }) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 1b61cb87c9a..e69d9e61eb9 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.14.0"; - sha256 = "1d9c0avfpbwvzyg53b59ks8shpnrxnbnshcd7ziizflsyv5vw5ax"; + version = "1.14.1"; + sha256 = "19542jxcjf4dvrqvgb5vr36mhbzcjrxc3v0xh451rm60610rf2dz"; }) |