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: 404041b20b4d
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: 198cac07cfa9
Choose a head ref
  • 6 commits
  • 7 files changed
  • 2 contributors

Commits on May 18, 2020

  1. zabbix: update source url 

    (cherry picked from commit c85f02c)
    @aanderse
    aanderse committed May 18, 2020
    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
    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

    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
    c0f19a3 View commit details

  2. bandwhich: 0.14.0 -> 0.15.0 

    https://github.com/imsnif/bandwhich/releases/tag/0.15.0
(cherry picked from commit 26d670c)
    @Ma27
    Ma27 committed May 23, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    675bf76 View commit details

  3. epson-escpr2: 1.1.11 -> 1.1.12 

    (cherry picked from commit 3ddc56c)
    @Ma27
    Ma27 committed May 23, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    198cac0 View commit details
8 changes: 4 additions & 4 deletions pkgs/misc/drivers/epson-escpr2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2";
version = "1.1.11";
version = "1.1.12";

src = fetchurl {
# To find new versions, visit
@@ -11,10 +11,10 @@ stdenv.mkDerivation rec {
# version.
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/11/01/98/8ff121831d0a6be76e86b87c78178f3c93df6d0f/epson-inkjet-printer-escpr2-1.1.11-1lsb3.2.src.rpm"
"https://web.archive.org/web/20200425154102/https://download3.ebz.epson.net/dsc/f/03/00/11/01/98/8ff121831d0a6be76e86b87c78178f3c93df6d0f/epson-inkjet-printer-escpr2-1.1.11-1lsb3.2.src.rpm"
"https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm"
"https://web.archive.org/web/20200523220202if_/https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm"
];
sha256 = "1gcdzmqli7jycljm66mdssivb3lk223ih6zg0l3lyn7hj2gbkinm";
sha256 = "07sq5xlmidqiycv0qwvpk2xf22vbkbk4fclnjlnx7s08d2jl75kv";
};

patches = [ ./cups-filter-ppd-dirs.patch ];
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;
};

4 changes: 2 additions & 2 deletions pkgs/tools/networking/bandwhich/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

rustPlatform.buildRustPackage rec {
pname = "bandwhich";
version = "0.14.0";
version = "0.15.0";

src = fetchFromGitHub {
owner = "imsnif";
repo = pname;
rev = version;
sha256 = "09lyl9cpb5li7kyh0y78lhgvvb24ssfjmkz65xzbgm5jyrz8rmr4";
sha256 = "09qr8s136ilqa9r5yjys2mnyyprhancn5n4maqmlfbjrz590g6nb";
};

cargoSha256 = "0ygprpayfdl3galxx06zsasavbqqlz389pppa7iwv7ssja3fily6";