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

Commits on May 18, 2020

  1. zabbix: update source url 

    (cherry picked from commit c85f02c)
    @aanderse
    aanderse committed May 18, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veehaitch Vincent Haupert
    GPG key ID: A8B605E96F82B4E4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    38e88e7 View commit details

  2. zabbix: 3.0.29 -> 3.0.30 

    (cherry picked from commit cc81ca7)
    @aanderse
    aanderse committed May 18, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    veehaitch Vincent Haupert
    GPG key ID: A8B605E96F82B4E4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a1b16d3 View commit details

  3. zabbix: 3.0.30 -> 3.0.31 

    (cherry picked from commit c2d3f26)
    @aanderse
    aanderse committed May 18, 2020
    Copy the full SHA
    216c101 View commit details

Commits on May 23, 2020

  1. Merge pull request #87180 from aanderse/zabbix-backport 

    zabbix: 3.0.29 -> 3.0.31 [20.03]
    @aanderse
    aanderse authored May 23, 2020
    Copy the full SHA
    c0f19a3 View commit details
2 changes: 1 addition & 1 deletion pkgs/servers/monitoring/zabbix/agent.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }:
inherit version;

src = fetchurl {
url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz";
url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
inherit sha256;
};

2 changes: 1 addition & 1 deletion pkgs/servers/monitoring/zabbix/proxy.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ in
inherit version;

src = fetchurl {
url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz";
url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
inherit sha256;
};

2 changes: 1 addition & 1 deletion pkgs/servers/monitoring/zabbix/server.nix
View file
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ in
inherit version;

src = fetchurl {
url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz";
url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
inherit sha256;
};

4 changes: 2 additions & 2 deletions pkgs/servers/monitoring/zabbix/versions.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ generic: {
};

v30 = generic {
version = "3.0.29";
sha256 = "1d81w68hnkjdj1a00iasg6aidw25syi4lrbsiyc98pdihmxbpiky";
version = "3.0.31";
sha256 = "0a2jznpmg24lqdqbc9p8i2q6jkz0hx53hh6q12xsvvmq48vi3snm";
};
}
2 changes: 1 addition & 1 deletion pkgs/servers/monitoring/zabbix/web.nix
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }:
inherit version;

src = fetchurl {
url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz";
url = "https://cdn.zabbix.com/zabbix/sources/stable/${stdenv.lib.versions.majorMinor version}/zabbix-${version}.tar.gz";
inherit sha256;
};