diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-26 18:27:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-26 18:27:09 +0000 |
| commit | c994c9d31e2ba478aa50a9d4b0d9cba6e25b27f5 (patch) | |
| tree | 498d17a87230f99e0a6e4b6256bb128885bc4194 /pkgs/servers | |
| parent | 69fca326f806e217b821a9c98493930699442c35 (diff) | |
| parent | fbaf92270556c23bb972f00d439051c8960ab97c (diff) | |
| download | nixpkgs-c994c9d31e2ba478aa50a9d4b0d9cba6e25b27f5.tar nixpkgs-c994c9d31e2ba478aa50a9d4b0d9cba6e25b27f5.tar.gz nixpkgs-c994c9d31e2ba478aa50a9d4b0d9cba6e25b27f5.tar.bz2 nixpkgs-c994c9d31e2ba478aa50a9d4b0d9cba6e25b27f5.tar.lz nixpkgs-c994c9d31e2ba478aa50a9d4b0d9cba6e25b27f5.tar.xz nixpkgs-c994c9d31e2ba478aa50a9d4b0d9cba6e25b27f5.tar.zst nixpkgs-c994c9d31e2ba478aa50a9d4b0d9cba6e25b27f5.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix | 16 | ||||
| -rw-r--r-- | pkgs/servers/ser2net/default.nix | 4 |
2 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix index a04bd6d9a9a..e07c8a5a5c0 100644 --- a/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nextcloud-exporter.nix @@ -2,26 +2,16 @@ buildGoModule rec { pname = "prometheus-nextcloud-exporter"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "xperimental"; repo = "nextcloud-exporter"; rev = "v${version}"; - sha256 = "1nmw1hkxgdp7nibrn1gz0lry0666rcc55s3kkfx64ykw6bnl0l34"; + sha256 = "0kq0ka2gjlibl7vhk3s4z15ja5ai7cmwl144gj4dyhylp2xzr72a"; }; - patches = [ - # fixes failing test, remove with next update - # see https://github.com/xperimental/nextcloud-exporter/pull/25 - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/xperimental/nextcloud-exporter/pull/25.patch"; - sha256 = "03jvqlqbs5g6ijncx6vxkgwq646yrjlrm0lk2q5vhfjrgrkv0alv"; - includes = [ "internal/config/config_test.go" ]; - }) - ]; - - vendorSha256 = "0xdjphki0p03n6g5b4mm2x0rgm902rnbvq8r6p4r45k3mv8cggmf"; + vendorSha256 = "0qs3p4jl8p0323bklrrhxzql7652pm6a1hj9ch9xyfhkwsx87l4d"; passthru.tests = { inherit (nixosTests.prometheus-exporters) nextcloud; }; diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index bbb40844ae5..a751e0872ee 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.3.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "13zhds3zav03f1snc4bb1j07i2x606bmnqm17yx37frib2hjs4nx"; + sha256 = "sha256-fA4rtFZ2lhGAwY3KUl/Jk8gjueI761J1QRdivMtbqX4="; }; passthru = { |