pyrox.dev / nixpkgs
lol
fork atom

nixos/atlassian: Fix eval error in jrePackage

The error got introduced by 4f3d971ef55b82ef349e5fb198196d2028fc0cf5,
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

aszlig 0e790b9f 063e4dca

options
unified split
Changed files
+3
nixos
modules
services
web-apps
atlassian
confluence.nix
crowd.nix
jira.nix
+1
nixos/modules/services/web-apps/atlassian/confluence.nix 
···

       
130

       
130

       
 

       
      jrePackage = mkOption {


     

       
131

       
131

       
 

       
        type = types.package;


     

       
132

       
132

       
 

       
        default = pkgs.oraclejre8;


     

       

       
133

       
+

       
        defaultText = "pkgs.oraclejre8";


     

       
133

       
134

       
 

       
        description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";


     

       
134

       
135

       
 

       
      };


     

       
135

       
136

       
 

       
    };
+1
nixos/modules/services/web-apps/atlassian/crowd.nix 
···

       
96

       
96

       
 

       
      jrePackage = mkOption {


     

       
97

       
97

       
 

       
        type = types.package;


     

       
98

       
98

       
 

       
        default = pkgs.oraclejre8;


     

       

       
99

       
+

       
        defaultText = "pkgs.oraclejre8";


     

       
99

       
100

       
 

       
        description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";


     

       
100

       
101

       
 

       
      };


     

       
101

       
102

       
 

       
    };
+1
nixos/modules/services/web-apps/atlassian/jira.nix 
···

       
134

       
134

       
 

       
      jrePackage = mkOption {


     

       
135

       
135

       
 

       
        type = types.package;


     

       
136

       
136

       
 

       
        default = pkgs.oraclejre8;


     

       

       
137

       
+

       
        defaultText = "pkgs.oraclejre8";


     

       
137

       
138

       
 

       
        description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";


     

       
138

       
139

       
 

       
      };


     

       
139

       
140

       
 

       
    };