diff options
| author | sfultong <sam.griffin@gmail.com> | 2014-08-20 23:02:16 -0400 |
|---|---|---|
| committer | Sam Griffin <sam.griffin@gmail.com> | 2014-08-20 23:08:39 -0400 |
| commit | c54a8ed1d05091d12d8341dbee7843e348cc2576 (patch) | |
| tree | a81a998feaca52e309ead4659adc1a2087589169 /pkgs/servers/http | |
| parent | 81ad94ce5106c5ab7f31044b591a6d2b884c02c1 (diff) | |
| download | nixlib-c54a8ed1d05091d12d8341dbee7843e348cc2576.tar nixlib-c54a8ed1d05091d12d8341dbee7843e348cc2576.tar.gz nixlib-c54a8ed1d05091d12d8341dbee7843e348cc2576.tar.bz2 nixlib-c54a8ed1d05091d12d8341dbee7843e348cc2576.tar.lz nixlib-c54a8ed1d05091d12d8341dbee7843e348cc2576.tar.xz nixlib-c54a8ed1d05091d12d8341dbee7843e348cc2576.tar.zst nixlib-c54a8ed1d05091d12d8341dbee7843e348cc2576.zip | |
Merge pull request #1 from sfultongv/sfultong-14.04
updating tomcat to version 7
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/recent.nix | 24 |
3 files changed, 35 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/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"; + }; +} |