diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2014-09-02 02:09:18 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2014-09-02 02:09:18 +0400 |
| commit | 3ad91106f14d297f2bd8601dc4ac801ed62d5f09 (patch) | |
| tree | 4ef009a801eeff23e22202bdc9a545070c5dba9f /pkgs/servers/http | |
| parent | 4e3ee2706048e871187c565ed49a013e3e8fe68e (diff) | |
| parent | 219983d6ad1bec55ab174d064d41d086654f9a17 (diff) | |
| download | nixlib-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.tar nixlib-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.tar.gz nixlib-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.tar.bz2 nixlib-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.tar.lz nixlib-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.tar.xz nixlib-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.tar.zst nixlib-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.zip | |
Merge pull request #3704 from sfultong/upstream-master
tomcat: update to upstream master
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/tomcat/6.0.nix | 27 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/7.0.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/8.0.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/http/tomcat/recent.nix | 24 |
4 files changed, 41 insertions, 22 deletions
diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index ee0049ce08f6..19f20cc8823c 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/pkgs/servers/http/tomcat/6.0.nix @@ -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"; - }; -} + } diff --git a/pkgs/servers/http/tomcat/7.0.nix b/pkgs/servers/http/tomcat/7.0.nix new file mode 100644 index 000000000000..87bc57eb2b65 --- /dev/null +++ b/pkgs/servers/http/tomcat/7.0.nix @@ -0,0 +1,6 @@ +import ./recent.nix + { + versionMajor = "7"; + versionMinor = "0.55"; + sha256 = "c20934fda63bc7311e2d8e067d67f886890c8be72280425c5f6f8fdd7a376c15"; + } diff --git a/pkgs/servers/http/tomcat/8.0.nix b/pkgs/servers/http/tomcat/8.0.nix new file mode 100644 index 000000000000..63b8d2bbc94e --- /dev/null +++ b/pkgs/servers/http/tomcat/8.0.nix @@ -0,0 +1,6 @@ +import ./recent.nix + { + versionMajor = "8"; + versionMinor = "0.9"; + sha256 = "5ea3c8260088ee4fd223a532a4b0c23a10e549c34705e2f190279a1a7f1f83d9"; + } diff --git a/pkgs/servers/http/tomcat/recent.nix b/pkgs/servers/http/tomcat/recent.nix new file mode 100644 index 000000000000..0d11ba7a1046 --- /dev/null +++ b/pkgs/servers/http/tomcat/recent.nix @@ -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"; + }; +} |