summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorMichael Raskin <7c6f434c@mail.ru>2014-09-02 02:09:18 +0400
committerMichael Raskin <7c6f434c@mail.ru>2014-09-02 02:09:18 +0400
commit3ad91106f14d297f2bd8601dc4ac801ed62d5f09 (patch)
tree4ef009a801eeff23e22202bdc9a545070c5dba9f /nixos
parent4e3ee2706048e871187c565ed49a013e3e8fe68e (diff)
parent219983d6ad1bec55ab174d064d41d086654f9a17 (diff)
downloadnixpkgs-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.tar
nixpkgs-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.tar.gz
nixpkgs-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.tar.bz2
nixpkgs-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.tar.lz
nixpkgs-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.tar.xz
nixpkgs-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.tar.zst
nixpkgs-3ad91106f14d297f2bd8601dc4ac801ed62d5f09.zip
Merge pull request #3704 from sfultong/upstream-master
tomcat: update to upstream master
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/web-servers/tomcat.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index c2f464014ae..2af249a8e96 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -5,7 +5,7 @@ with lib;
 let
 
   cfg = config.services.tomcat;
-  tomcat = pkgs.tomcat6;
+  tomcat = pkgs.tomcat7;
 in
 
 {