Skip to content

Commit 0e790b9

Browse files
committedNov 9, 2017
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
1 parent 063e4dc commit 0e790b9

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed
 

Diff for: ‎nixos/modules/services/web-apps/atlassian/confluence.nix

+1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ in
130130
jrePackage = mkOption {
131131
type = types.package;
132132
default = pkgs.oraclejre8;
133+
defaultText = "pkgs.oraclejre8";
133134
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
134135
};
135136
};

Diff for: ‎nixos/modules/services/web-apps/atlassian/crowd.nix

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ in
9696
jrePackage = mkOption {
9797
type = types.package;
9898
default = pkgs.oraclejre8;
99+
defaultText = "pkgs.oraclejre8";
99100
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
100101
};
101102
};

Diff for: ‎nixos/modules/services/web-apps/atlassian/jira.nix

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ in
134134
jrePackage = mkOption {
135135
type = types.package;
136136
default = pkgs.oraclejre8;
137+
defaultText = "pkgs.oraclejre8";
137138
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
138139
};
139140
};

0 commit comments

Comments
 (0)
Please sign in to comment.