diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-05-26 00:20:17 +0000 |
| commit | ad35019501e6b263e08ecb4c66f1ee6e3eee80f1 (patch) | |
| tree | 492149cd4a5da50945a5bc7d5fa62de432590dea /pkgs/servers/atlassian/confluence.nix | |
| parent | 98f2f08b4b9b204912c1c097a08cd26151fae0bb (diff) | |
| parent | 97e376bf9cafa2d6c812221677f2e38163d0acb8 (diff) | |
| download | nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.gz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.bz2 nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.lz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.xz nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.tar.zst nixlib-ad35019501e6b263e08ecb4c66f1ee6e3eee80f1.zip | |
Merge branch 'master' into staging
Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master
Diffstat (limited to 'pkgs/servers/atlassian/confluence.nix')
| -rw-r--r-- | pkgs/servers/atlassian/confluence.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index a5d89b493e82..c3427b8029e5 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "atlassian-confluence-${version}"; - version = "6.6.1"; + version = "6.8.0"; src = fetchurl { url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; - sha256 = "0nb8rjzfd0fqd9k1yxa3dj7kxgh84dgbg9l8jyj59g74ym77qmw0"; + sha256 = "07awdbkjxkk4rbnpbb5xfjp4125c33bwxncmydlgzgk5fzy6dg2w"; }; phases = [ "unpackPhase" "buildPhase" "installPhase" ]; |