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: f6dac8083874
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: c43fe70feb82
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Oct 21, 2019

  1. zabbix: init at 4.4.0 

    (cherry picked from commit fdee83d)
    @aanderse
    aanderse committed Oct 21, 2019
    Copy the full SHA
    3e3a11e View commit details

Commits on Oct 22, 2019

  1. Merge pull request #71600 from aanderse/zabbix 

    zabbix: init at 4.4.0 [19.09 backport]
    @mmahut
    mmahut authored Oct 22, 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
    02351dd View commit details

  2. gitlab-runner: 12.3.0 -> 12.4.0 

    (cherry picked from commit 95b324e)
    @max-wittig @globin
    max-wittig authored and globin committed Oct 22, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    GPG key ID: D5C458DF6DD97EDF
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c43fe70 View commit details
8 changes: 4 additions & 4 deletions pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:

let
version = "12.3.0";
version = "12.4.0";
# Gitlab runner embeds some docker images these are prebuilt for arm and x86_64
docker_x86_64 = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz";
sha256 = "11xbz24811vi3l1dwhyqv3mypawrky85qjsg6aaigfv8zj9l2xmi";
sha256 = "0x0i60l8w3iwf7kn1wi8hh87cc3rvxixi2bizd5807aw22g9z5pd";
};

docker_arm = fetchurl {
url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz";
sha256 = "04gfhlm32wrdq0s9blmfknpcnmr30vrnd7afib1lfbzbdl99g4sx";
sha256 = "1a2z2m4c2cixibjgh6xv9yi760n10v374nb9jl2pf62rlpqkwz83";
};
in
buildGoPackage rec {
@@ -29,7 +29,7 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "155im9sybkldh0rx34j9fm3qg95dm5q3jcjjx635b7fwq1wyl7c7";
sha256 = "0sdf3w5iq08dyhn2b9rz0sssxq4yfbki2z834z5l02wzjl8h2nk6";
};

patches = [ ./fix-shell-path.patch ];
5 changes: 5 additions & 0 deletions pkgs/servers/monitoring/zabbix/versions.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
generic: {
v44 = generic {
version = "4.4.0";
sha256 = "1a4csx1i21lcavfvj5djalcnxnlyh4mhk4dddzm895ipl87afzf4";
};

v42 = generic {
version = "4.2.6";
sha256 = "0r08v9ka0v8d7w133yr09vaxzl5lhbrsvbx900x15qv8lwliysv4";
1 change: 1 addition & 0 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -15278,6 +15278,7 @@ in
server = server-pgsql;
};

zabbix44 = zabbixFor "v44";
zabbix42 = zabbixFor "v42";
zabbix40 = zabbixFor "v40";
zabbix30 = zabbixFor "v30";