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: beb9ffe3d7bd
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: f2b55f28271c
Choose a head ref
  • 8 commits
  • 7 files changed
  • 6 contributors

Commits on Dec 18, 2019

  1. atlassian-confluence: 7.0.3 -> 7.1.0

    @globin @WilliButz
    globin authored and WilliButz committed Dec 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    WilliButz
    GPG key ID: 92582A10F1179CB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    15db4fc View commit details

  2. atlassian-confluence: 7.1.0 -> 7.2.0

    @WilliButz
    WilliButz committed Dec 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    WilliButz
    GPG key ID: 92582A10F1179CB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a53c73d View commit details

Commits on Dec 19, 2019

  1. mailutils: 3.2 -> 3.8

    @grahamc
    grahamc committed Dec 19, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: FE918C3A98C1030F
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e19e95d View commit details

  2. fluent-bit: 1.3.4 -> 1.3.5

    @marsam
    marsam committed Dec 19, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7010698 View commit details

  3. alertmanager-bot: init at 0.4.0

    @mmahut @ehmry
    mmahut authored and ehmry committed Dec 19, 2019
    Copy the full SHA
    2f3cd7d View commit details

  4. Merge pull request #75907 from mayflower/confluence-update 

    atlassian-confluence: 7.0.3 -> 7.2.0
    @fpletz
    fpletz authored Dec 19, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e3973ac View commit details

  5. Merge pull request #75912 from grahamc/python3/mailutils 

    mailutils: 3.2 -> 3.8
    @fpletz
    fpletz authored Dec 19, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8134659 View commit details

  6. Merge pull request #75915 from marsam/update-fluent-bit 

    fluent-bit: 1.3.4 -> 1.3.5
    @fpletz
    fpletz authored Dec 19, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f2b55f2 View commit details
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.3";
version = "7.2.0";

src = fetchurl {
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
sha256 = "1anmhfdy4q74wchzha8fd2bd5hx0a2v3bgp9p5yvb8cal31zqcpd";
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 ];
};
}
25 changes: 25 additions & 0 deletions pkgs/servers/monitoring/alertmanager-bot/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:

buildGoPackage rec {
pname = "alertmanager-bot";
version = "0.4.0";

goPackagePath = "github.com/metalmatze/alertmanager-bot";

src = fetchFromGitHub {
owner = "metalmatze";
repo = pname;
rev = version;
sha256 = "10v0fxxcs5s6zmqindr30plyw7p2yg0a64rdw1b2cj2mc1m3byx3";
};

goDeps = ./deps.nix;

meta = with stdenv.lib; {
description = "Bot for Prometheus' Alertmanager";
homepage = "https://github.com/metalmatze/alertmanager-bot";
license = licenses.mit;
platforms = platforms.all;
maintainers = with maintainers; [ mmahut ];
};
}
Loading