Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5c4059dd7536
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6655a13a56f3
Choose a head ref
  • 3 commits
  • 1 file changed
  • 3 contributors

Commits on Dec 19, 2019

  1. atlassian-confluence: 7.0.2 -> 7.0.3 

    (cherry picked from commit a8b985d)
    @r-ryantm @fpletz
    r-ryantm authored and fpletz committed Dec 19, 2019
    Copy the full SHA
    c27fb88 View commit details

  2. atlassian-confluence: 7.0.3 -> 7.1.0 

    (cherry picked from commit 15db4fc)
    @globin @fpletz
    globin authored and fpletz committed Dec 19, 2019
    Copy the full SHA
    6a0c115 View commit details

  3. atlassian-confluence: 7.1.0 -> 7.2.0 

    (cherry picked from commit a53c73d)
    @WilliButz @fpletz
    WilliButz authored and fpletz committed Dec 19, 2019
    Copy the full SHA
    6655a13 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/servers/atlassian/confluence.nix
8 changes: 4 additions & 4 deletions pkgs/servers/atlassian/confluence.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "atlassian-confluence";
version = "7.0.2";
version = "7.2.0";

src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
sha256 = "00ma2l6gknlpaf2k26md9fskgzcllky3vv89sb1izsrxl8la1dhq";
sha256 = "1srwxk9c26hp1j3v6v1hr16l4dqaaiwrli5a9n9a44hkl7qy8yzl";
};

buildPhase = ''
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {

meta = with stdenv.lib; {
description = "Team collaboration software written in Java and mainly used in corporate environments";
homepage = https://www.atlassian.com/software/confluence;
homepage = "https://www.atlassian.com/software/confluence";
license = licenses.unfree;
maintainers = with maintainers; [ fpletz globin ];
maintainers = with maintainers; [ fpletz globin willibutz ];
};
}