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

Commits on Oct 18, 2017

  1. atlassian-confluence: 6.4.0 -> 6.4.2 

    (cherry picked from commit e307421)
    @fpletz
    fpletz committed Oct 18, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    35a4a7d View commit details

  2. atlassian-jira: 7.5.0 -> 7.5.1 

    (cherry picked from commit 369cbba)
    @fpletz
    fpletz committed Oct 18, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9dfb8ee View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/servers/atlassian/confluence.nix
  2. +2 −2 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 {
name = "atlassian-confluence-${version}";
version = "6.4.0";
version = "6.4.2";

src = fetchurl {
url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz";
sha256 = "1ba8zpcywnnanzqxjaqiyfc6j5qr6jk6laryz8npiqz4grv3qk61";
sha256 = "1akwbgbks6k63m22vrcvvz9jz4wqz380j8gb8lzbzm4yk8y7f4p9";
};

phases = [ "unpackPhase" "buildPhase" "installPhase" ];
4 changes: 2 additions & 2 deletions pkgs/servers/atlassian/jira.nix
View file
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
name = "atlassian-jira-${version}";
version = "7.5.0";
version = "7.5.1";

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

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