diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-05-12 08:18:59 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-05-12 09:12:19 +0200 |
commit | 2006fd4fc5a20c72ab2166b2b4039307f4f54bcb (patch) | |
tree | 2fbbdc859d5369adcb995ce34d4455730f2b534a /pkgs/servers/monitoring/zabbix/proxy.nix | |
parent | 14cf5e2c05f9b11490d9bba3afa521226227197f (diff) | |
parent | c89072465c75c1a9acf51d623cdbc51d1f37c168 (diff) | |
download | nixlib-2006fd4fc5a20c72ab2166b2b4039307f4f54bcb.tar nixlib-2006fd4fc5a20c72ab2166b2b4039307f4f54bcb.tar.gz nixlib-2006fd4fc5a20c72ab2166b2b4039307f4f54bcb.tar.bz2 nixlib-2006fd4fc5a20c72ab2166b2b4039307f4f54bcb.tar.lz nixlib-2006fd4fc5a20c72ab2166b2b4039307f4f54bcb.tar.xz nixlib-2006fd4fc5a20c72ab2166b2b4039307f4f54bcb.tar.zst nixlib-2006fd4fc5a20c72ab2166b2b4039307f4f54bcb.zip |
Merge branch 'staging' into staging-next
Just pull fix for gcc10 "merge conflict". Now it evaluates and builds.
Diffstat (limited to 'pkgs/servers/monitoring/zabbix/proxy.nix')
0 files changed, 0 insertions, 0 deletions