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

Atlassian apps: remove misleading JRE switch logic

Browse Source 
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:
Jean-Baptiste Giraudeau 2017-11-08 20:26:03 +01:00 committed by Robin Gloster
parent 3c06d9f0b0
commit 4f3d971ef5
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/services/web-apps/atlassian/confluence.nix
View File

@ -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).";
};
};
};

10
nixos/modules/services/web-apps/atlassian/crowd.nix
View File

@ -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).";
};
};
};

10
nixos/modules/services/web-apps/atlassian/jira.nix
View File

@ -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).";
};
};
};