diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
| commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
| tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/servers/atlassian | |
| parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
| parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
| download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip | |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/servers/atlassian')
| -rw-r--r-- | nixpkgs/pkgs/servers/atlassian/confluence.nix | 15 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/atlassian/jira.nix | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/servers/atlassian/confluence.nix b/nixpkgs/pkgs/servers/atlassian/confluence.nix index a5aead770b8a..db5baf6e5afb 100644 --- a/nixpkgs/pkgs/servers/atlassian/confluence.nix +++ b/nixpkgs/pkgs/servers/atlassian/confluence.nix @@ -1,15 +1,18 @@ -{ stdenv, lib, fetchurl +{ stdenvNoCC, lib, fetchurl, mysql_jdbc ? null , enableSSO ? false , crowdProperties ? null +, withMysql ? true }: -stdenv.mkDerivation rec { +assert withMysql -> (mysql_jdbc != null); + +stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "1srwxk9c26hp1j3v6v1hr16l4dqaaiwrli5a9n9a44hkl7qy8yzl"; + sha256 = "1d37hiabph56frsp8jrn80fmglgw6k1dlc4x8p7m82fb3vild049"; }; buildPhase = '' @@ -28,6 +31,8 @@ stdenv.mkDerivation rec { cat <<EOF > confluence/WEB-INF/classes/crowd.properties ${crowdProperties} EOF + '' + lib.optionalString withMysql '' + cp -v ${mysql_jdbc}/share/java/*jar confluence/WEB-INF/lib/ ''; installPhase = '' @@ -35,7 +40,7 @@ stdenv.mkDerivation rec { patchShebangs $out/bin ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Team collaboration software written in Java and mainly used in corporate environments"; homepage = "https://www.atlassian.com/software/confluence"; license = licenses.unfree; diff --git a/nixpkgs/pkgs/servers/atlassian/jira.nix b/nixpkgs/pkgs/servers/atlassian/jira.nix index e5bc253f83df..611db53d6458 100644 --- a/nixpkgs/pkgs/servers/atlassian/jira.nix +++ b/nixpkgs/pkgs/servers/atlassian/jira.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.6.0"; + version = "8.7.1"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "091vcr0hvrrm9zjqs67ai5mkx7b8ybpwqpdxy7jw5z3994rdx3xw"; + sha256 = "0f46j94xjb5a5f74fsykjif64s9w2yd9ccy9098yrzaa8lbwdgpz"; }; buildPhase = '' |