Merge pull request #1 from sfultongv/sfultong-14.04

updating tomcat to version 7
This commit is contained in:
sfultong 2014-08-20 23:02:16 -04:00 committed by Sam Griffin
parent 81ad94ce51
commit c54a8ed1d0
5 changed files with 38 additions and 23 deletions

View file

@ -5,7 +5,7 @@ with lib;
let
cfg = config.services.tomcat;
tomcat = pkgs.tomcat6;
tomcat = pkgs.tomcat7;
in
{

View file

@ -1,23 +1,6 @@
{ stdenv, fetchurl }:
let version = "6.0.39"; in
stdenv.mkDerivation rec {
name = "apache-tomcat-${version}";
src = fetchurl {
url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz";
import ./recent.nix
{
versionMajor = "6";
versionMinor = "0.39";
sha256 = "19qix6affhc252n03smjf482drg3nxd27shni1gvhphgj3zfmgfy";
};
installPhase =
''
mkdir $out
mv * $out
'';
meta = {
homepage = http://tomcat.apache.org/;
description = "An implementation of the Java Servlet and JavaServer Pages technologies";
};
}
}

View file

@ -0,0 +1,6 @@
import ./recent.nix
{
versionMajor = "7";
versionMinor = "0.55";
sha256 = "c20934fda63bc7311e2d8e067d67f886890c8be72280425c5f6f8fdd7a376c15";
}

View file

@ -0,0 +1,24 @@
{ versionMajor, versionMinor, sha256 }:
{ stdenv, fetchurl }:
let version = "${versionMajor}.${versionMinor}"; in
stdenv.mkDerivation rec {
name = "apache-tomcat-${version}";
src = fetchurl {
url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz";
inherit sha256;
};
installPhase =
''
mkdir $out
mv * $out
'';
meta = {
homepage = http://tomcat.apache.org/;
description = "An implementation of the Java Servlet and JavaServer Pages technologies";
};
}

View file

@ -7022,6 +7022,8 @@ let
tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { };
tomcat7 = callPackage ../servers/http/tomcat/7.0.nix { };
tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };
axis2 = callPackage ../servers/http/tomcat/axis2 { };