nixos/atlassian: Fix eval error in jrePackage

The error got introduced by 4f3d971, which removed the *Text attributes from the option. This in turn leads to an evaluation error while building the manual/manpage, because oraclejre8 is marked unfree. Signed-off-by: aszlig <aszlig@nix.build> Cc: @jbgi, @orivej, @globin
NixOS · Nov 9, 2017 · 0e790b9 · 0e790b9
1 parent 063e4dc
commit 0e790b9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix
@@ -130,6 +130,7 @@ in
       jrePackage = mkOption {
         type = types.package;
         default = pkgs.oraclejre8;
+        defaultText = "pkgs.oraclejre8";
         description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
       };
     };

diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix
@@ -96,6 +96,7 @@ in
       jrePackage = mkOption {
         type = types.package;
         default = pkgs.oraclejre8;
+        defaultText = "pkgs.oraclejre8";
         description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
       };
     };

diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix
@@ -134,6 +134,7 @@ in
       jrePackage = mkOption {
         type = types.package;
         default = pkgs.oraclejre8;
+        defaultText = "pkgs.oraclejre8";
         description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
       };
     };