diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
commit | 716aac2519a7571e7f5fd984a886d579a4a051c5 (patch) | |
tree | 53cf89cf764d787f4dc8f08474479892b9733177 /pkgs/servers/http | |
parent | f8472457a440de3c44f6f604142d678b6ae2a762 (diff) | |
parent | 53b389327e34de319dc0dbda2b6bcab1a69db69d (diff) | |
download | nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.gz nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.bz2 nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.lz nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.xz nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.tar.zst nixlib-716aac2519a7571e7f5fd984a886d579a4a051c5.zip |
Merge branch 'staging' into closure-size
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/unstable.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/pshs/default.nix | 11 | ||||
-rw-r--r-- | pkgs/servers/http/tomcat/axis2/default.nix | 11 |
4 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 00b3c6a9d6a4..d0d587eb0410 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -71,8 +71,8 @@ src = fetchFromGitHub { owner = "openresty"; repo = "lua-nginx-module"; - rev = "v0.9.19"; - sha256 = "13h58rzdfhc5kc4xqwrd2p34rgnwim4hikq923cnfz1p2bvlddrf"; + rev = "v0.10.0"; + sha256 = "0isdqrnjhfy4zlydj4csf91i9184ykazyah3i63jfrmmarxr5li1"; }; inputs = [ pkgs.luajit ]; preConfigure = '' diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index 4fc513a11739..b5d672ae46ce 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -7,10 +7,10 @@ with stdenv.lib; let - version = "1.9.7"; + version = "1.9.9"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "1ma82wfg9akghx1cnzfmz4nplf0zjv1rk49x4v3f3z7xmwbx4jvr"; + sha256 = "0wwd0q00pnkw4gjn3izjr63sndp7piyc5k5mbjm369f824mvnrny"; }; in diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index 141f58417fb6..b9a42b4a5f61 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode }: +{ stdenv, fetchurl, pkgconfig, libevent, file, qrencode, miniupnpc }: let - version = "0.2.6"; + version = "0.3"; in stdenv.mkDerivation { name = "pshs-${version}"; src = fetchurl { url = "https://www.bitbucket.org/mgorny/pshs/downloads/pshs-${version}.tar.bz2"; - sha256 = "0n8l5sjnwjqjmw0jzg3hb93n6npg2wahmdg1zrpsw8fyh9ggjg4g"; + sha256 = "0qvy1m9jmbjhbihs1qr9nasbaajl3n0x8bgz1vw9xvpkqymx5i63"; }; - buildInputs = [ pkgconfig libevent file qrencode ]; + buildInputs = [ pkgconfig libevent file qrencode miniupnpc ]; - # TODO: enable ssl once dependencies - # (libssl libcrypto libevent >= 2.1 libevent_openssl) can be met + # SSL requires libevent at 2.1 with ssl support configureFlags = "--disable-ssl"; meta = { diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 9aacc6aa85ad..50e6b2987045 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -1,11 +1,12 @@ -{stdenv, fetchurl, apacheAnt, jdk, unzip}: +{ stdenv, fetchurl, apacheAnt, jdk, unzip }: -stdenv.mkDerivation { - name = "axis2-1.6.3"; +stdenv.mkDerivation rec { + name = "axis2-${version}"; + version = "1.6.4"; src = fetchurl { - url = http://apache.proserve.nl/axis/axis2/java/core/1.6.3/axis2-1.6.3-bin.zip; - sha256 = "0a49m7g1gxb904d0az2kbkab8rg02wm8nzbyipiad9k028masr6r"; + url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip"; + sha256 = "12ir706dn95567j6lkxdwrh28vnp6292h59qwjyqjm7ckglkmgyr"; }; buildInputs = [ unzip apacheAnt jdk ]; |