Merge remote-tracking branch 'upstream/master' into hardened-stdenv

6 files changed, 23 insertions, 65 deletions

diff --git a/pkgs/servers/http/jetty/6.1/bin-builder.sh b/pkgs/servers/http/jetty/6.1/bin-builder.sh
deleted file mode 100644
index bec0663bee78..000000000000
--- a/pkgs/servers/http/jetty/6.1/bin-builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-set -e
-
-source $stdenv/setup
-
-unzip $src
-mkdir -p $out/$name
-mv jetty*/* $out/$name
diff --git a/pkgs/servers/http/jetty/6.1/default.nix b/pkgs/servers/http/jetty/6.1/default.nix
deleted file mode 100644
index 894a21fdece9..000000000000
--- a/pkgs/servers/http/jetty/6.1/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, unzip}:
-
-stdenv.mkDerivation {
-  name = "jetty-6.1.26";
-
-  builder = ./bin-builder.sh;
-  buildInputs = [unzip];
-
-  src = fetchurl {
-    url = http://dist.codehaus.org/jetty/jetty-6.1.26/jetty-6.1.26.zip;
-    sha256 = "11w1ciayv8zvxjg45xzs0kwc7k45x97sbnxkqb62sxy3gsw8xh4n";
-  };
-}
diff --git a/pkgs/servers/http/jetty/9.2.nix b/pkgs/servers/http/jetty/9.2.nix
deleted file mode 100644
index 7bef32f3db2a..000000000000
--- a/pkgs/servers/http/jetty/9.2.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "jetty-9.2.5";
-
-  src = fetchurl {
-    url = "http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.2.11.v20150529.tar.gz&r=1";
-    name = "jetty-distribution-9.2.11.v20150529.tar.gz";
-    sha256 = "1d9s9l64b1l3x6vkx8qwgzfqwm55iq5g9xjjm2h2akf494yx1mrd";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    mkdir -p $out
-    mv etc lib modules start.jar $out
-  '';
-
-  meta = {
-    description = "A Web server and javax.servlet container";
-
-    homepage = http://www.eclipse.org/jetty/;
-
-    platforms = stdenv.lib.platforms.all;
-
-    license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ];
-  };
-}
diff --git a/pkgs/servers/http/jetty/bin-builder.sh b/pkgs/servers/http/jetty/bin-builder.sh
deleted file mode 100644
index 1da42099dca4..000000000000
--- a/pkgs/servers/http/jetty/bin-builder.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-set -e
-
-source $stdenv/setup
-
-unzip $src
-mkdir $out
-mv jetty*/* $out
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 78b6e4cc7eee..c9049259fb26 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -1,13 +1,26 @@
-{stdenv, fetchurl, unzip}:
+{ stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "jetty-6.1.4";
-
-  builder = ./bin-builder.sh;
-  buildInputs = [unzip];
+stdenv.mkDerivation rec {
+  name = "jetty-${version}";
+  version = "9.3.9.v20160517";
 
   src = fetchurl {
-    url = mirror://sourceforge/jetty/jetty-6.1.4.zip;
-    sha256 = "061cx442g5a5szzms9zhnfmr4aipmqyy9r8m5r84gr79gz9z6dv0";
+    url = "http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
+    name = "jetty-distribution-${version}.tar.gz";
+    sha256 = "0yqzcv4mj9wj8882jssf8ylh6s3jhgylrqxfggbn102dw05pppqs";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    mv etc lib modules start.jar $out
+  '';
+
+  meta = {
+    description = "A Web server and javax.servlet container";
+    homepage = http://www.eclipse.org/jetty/;
+    platforms = stdenv.lib.platforms.all;
+    license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ];
   };
 }
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 888efc006d0f..2785bd27d77e 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -81,8 +81,8 @@
     src = fetchFromGitHub {
       owner = "openresty";
       repo = "lua-nginx-module";
-      rev = "v0.10.0";
-      sha256 = "0isdqrnjhfy4zlydj4csf91i9184ykazyah3i63jfrmmarxr5li1";
+      rev = "v0.10.5";
+      sha256 = "0wz5j4kqa6hk7ar42bkxp0hd74psjy6sfsldh1a6p93z349iz4v5";
     };
     inputs = [ pkgs.luajit ];
     preConfigure = ''