public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/atlassian: Fix eval error in jrePackage

Browse Source 
The error got introduced by 4f3d971ef5,
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
This commit is contained in:
aszlig
2017-11-09 20:31:41 +01:00
parent 063e4dca79
commit 0e790b9f66
3 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/web-apps/atlassian/confluence.nix
+1
View File
@@ -130,6 +130,7 @@ in
jrePackage = mkOption { jrePackage = mkOption {
type = types.package; type = types.package;
default = pkgs.oraclejre8; default = pkgs.oraclejre8;
defaultText = "pkgs.oraclejre8";
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
}; };
}; };
nixos/modules/services/web-apps/atlassian/crowd.nix
+1
View File
@@ -96,6 +96,7 @@ in
jrePackage = mkOption { jrePackage = mkOption {
type = types.package; type = types.package;
default = pkgs.oraclejre8; default = pkgs.oraclejre8;
defaultText = "pkgs.oraclejre8";
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
}; };
}; };
nixos/modules/services/web-apps/atlassian/jira.nix
+1
View File
@@ -134,6 +134,7 @@ in
jrePackage = mkOption { jrePackage = mkOption {
type = types.package; type = types.package;
default = pkgs.oraclejre8; default = pkgs.oraclejre8;
defaultText = "pkgs.oraclejre8";
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
}; };
}; };