Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 08d245eb31a3
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3939055dda52
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Jun 10, 2018

  1. tomcat service: fix webapps default option (#40657) 

    The old package tomcat.webapps does not exist

(cherry picked from commit 1daa771)
    @fadenb @xeji
    fadenb authored and xeji committed Jun 10, 2018
    Copy the full SHA
    3939055 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/modules/services/web-servers/tomcat.nix
4 changes: 2 additions & 2 deletions nixos/modules/services/web-servers/tomcat.nix
View file
Original file line number Diff line number Diff line change
@@ -78,8 +78,8 @@ in

webapps = mkOption {
type = types.listOf types.package;
default = [ tomcat.webapps ];
defaultText = "[ tomcat.webapps ]";
default = [ tomcat85.webapps ];
defaultText = "[ tomcat85.webapps ]";
description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat";
};