Atlassian apps: remove misleading JRE switch logic
Only the Oracle JRE is supported by Atlassian appsAtlassian apps (see https://jira.atlassian.com/browse/JRASERVER-46152) Plus Atlassian apps are non free so the switch logic always chose Oracle JRE anyway. Option is kept in case someone want to patch apps to support openjdk.
This commit is contained in:
parent
3c06d9f0b0
commit
4f3d971ef5
|
@ -127,14 +127,10 @@ in
|
|||
|
||||
|
||||
|
||||
jrePackage = let
|
||||
jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
|
||||
in mkOption {
|
||||
jrePackage = mkOption {
|
||||
type = types.package;
|
||||
default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre;
|
||||
defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre";
|
||||
example = literalExample "pkgs.openjdk8.jre";
|
||||
description = "Java Runtime to use for Confluence. Note that Atlassian recommends the Oracle JRE.";
|
||||
default = pkgs.oraclejre8;
|
||||
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -93,14 +93,10 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
jrePackage = let
|
||||
jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
|
||||
in mkOption {
|
||||
jrePackage = mkOption {
|
||||
type = types.package;
|
||||
default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre;
|
||||
defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre";
|
||||
example = literalExample "pkgs.openjdk8.jre";
|
||||
description = "Java Runtime to use for Crowd. Note that Atlassian recommends the Oracle JRE.";
|
||||
default = pkgs.oraclejre8;
|
||||
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -131,14 +131,10 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
jrePackage = let
|
||||
jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free;
|
||||
in mkOption {
|
||||
jrePackage = mkOption {
|
||||
type = types.package;
|
||||
default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre;
|
||||
defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre";
|
||||
example = literalExample "pkgs.openjdk8.jre";
|
||||
description = "Java Runtime to use for JIRA. Note that Atlassian recommends the Oracle JRE.";
|
||||
default = pkgs.oraclejre8;
|
||||
description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152).";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue