ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3704 from sfultong/upstream-master

Browse Source 
tomcat: update to upstream master
This commit is contained in:
Michael Raskin 2014-09-02 02:09:18 +04:00
commit 3ad91106f1
6 changed files with 46 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/web-servers/tomcat.nix
View File

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

27
pkgs/servers/http/tomcat/6.0.nix
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";
};
}
}

6
pkgs/servers/http/tomcat/7.0.nix Normal file
View File

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

6
pkgs/servers/http/tomcat/8.0.nix Normal file
View File

@ -0,0 +1,6 @@
import ./recent.nix
{
versionMajor = "8";
versionMinor = "0.9";
sha256 = "5ea3c8260088ee4fd223a532a4b0c23a10e549c34705e2f190279a1a7f1f83d9";
}

24
pkgs/servers/http/tomcat/recent.nix Normal file
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";
};
}

4
pkgs/top-level/all-packages.nix
View File

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