diff options
| author | aszlig <aszlig@nix.build> | 2017-11-09 20:28:49 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2017-11-09 20:31:41 +0100 |
| commit | 0e790b9f664136a4a75b78652c9dac834d914c71 (patch) | |
| tree | fe0c64f9fa211fc08082d814276c6ee57ac7d223 | |
| parent | 063e4dca79922e1119b198b7810d294e8999395a (diff) | |
| download | nixpkgs-0e790b9f664136a4a75b78652c9dac834d914c71.tar nixpkgs-0e790b9f664136a4a75b78652c9dac834d914c71.tar.gz nixpkgs-0e790b9f664136a4a75b78652c9dac834d914c71.tar.bz2 nixpkgs-0e790b9f664136a4a75b78652c9dac834d914c71.tar.lz nixpkgs-0e790b9f664136a4a75b78652c9dac834d914c71.tar.xz nixpkgs-0e790b9f664136a4a75b78652c9dac834d914c71.tar.zst nixpkgs-0e790b9f664136a4a75b78652c9dac834d914c71.zip | |
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
| -rw-r--r-- | nixos/modules/services/web-apps/atlassian/confluence.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/atlassian/crowd.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/atlassian/jira.nix | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix index d59dd011c56..84c41b6e53c 100644 --- a/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -130,6 +130,7 @@ in jrePackage = mkOption { type = types.package; default = pkgs.oraclejre8; + defaultText = "pkgs.oraclejre8"; description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; }; }; diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix index 97bec1b4b82..0ac941b6ec9 100644 --- a/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -96,6 +96,7 @@ in jrePackage = mkOption { type = types.package; default = pkgs.oraclejre8; + defaultText = "pkgs.oraclejre8"; description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; }; }; diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix index 9408831731f..81ee8154326 100644 --- a/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -134,6 +134,7 @@ in jrePackage = mkOption { type = types.package; default = pkgs.oraclejre8; + defaultText = "pkgs.oraclejre8"; description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; }; }; |