Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4fb5cdd4133e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 92bd7a76506f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 12, 2019

  1. atlassian-confluence: 6.15.8 -> 7.0.2

    @globin
    globin committed Oct 12, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    renovate-bot Mend Renovate
    GPG key ID: 81C63AE1C224182B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c7788ab View commit details

  2. atlassian-jira: 8.4.1 -> 8.4.2

    @globin
    globin committed Oct 12, 2019
    Copy the full SHA
    92bd7a7 View commit details
Showing with 4 additions and 6 deletions.
  1. +2 −2 pkgs/servers/atlassian/confluence.nix
  2. +2 −4 pkgs/servers/atlassian/jira.nix
4 changes: 2 additions & 2 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 = "6.15.8";
version = "7.0.2";

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

buildPhase = ''
6 changes: 2 additions & 4 deletions pkgs/servers/atlassian/jira.nix
View file
Original file line number Diff line number Diff line change
@@ -5,15 +5,13 @@

stdenv.mkDerivation rec {
pname = "atlassian-jira";
version = "8.4.1";
version = "8.4.2";

src = fetchurl {
url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz";
sha256 = "0dkilp5wvda29rin2wj9zs2vgwyfning7cz6dyk0kyg45dl07wky";
sha256 = "0f0l9ss8jv06iidg8jw7yk5z42r1m0cbmlgj1wgli9a21ssp65sh";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];

buildPhase = ''
mv conf/server.xml conf/server.xml.dist
ln -sf /run/atlassian-jira/server.xml conf/server.xml