diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-12 12:01:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-12 12:01:10 +0000 |
| commit | 80180c339e5e8c7e4b9e440df777ae2fb76b1811 (patch) | |
| tree | 9e87cdec757577c22a5a7a8c50615a2f2834a538 /pkgs/servers | |
| parent | d599106fc4450fa757f42cf39e55dcd2ed7c7d1d (diff) | |
| parent | 67a706a70a75054d895c5cefffaf3a4fe9c6d6b6 (diff) | |
| download | nixpkgs-80180c339e5e8c7e4b9e440df777ae2fb76b1811.tar nixpkgs-80180c339e5e8c7e4b9e440df777ae2fb76b1811.tar.gz nixpkgs-80180c339e5e8c7e4b9e440df777ae2fb76b1811.tar.bz2 nixpkgs-80180c339e5e8c7e4b9e440df777ae2fb76b1811.tar.lz nixpkgs-80180c339e5e8c7e4b9e440df777ae2fb76b1811.tar.xz nixpkgs-80180c339e5e8c7e4b9e440df777ae2fb76b1811.tar.zst nixpkgs-80180c339e5e8c7e4b9e440df777ae2fb76b1811.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/endlessh-go/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/pkgs/servers/endlessh-go/default.nix b/pkgs/servers/endlessh-go/default.nix index ba0dc66a740..eae3cd6a8d5 100644 --- a/pkgs/servers/endlessh-go/default.nix +++ b/pkgs/servers/endlessh-go/default.nix @@ -1,22 +1,27 @@ -{ buildGoModule, fetchFromGitHub, lib }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "endlessh-go"; - version = "20220213"; + version = "20220308.1"; src = fetchFromGitHub { owner = "shizunge"; repo = "endlessh-go"; rev = version; - sha256 = "sha256-x/38w0GtzYBGWr0ZkfY2HmDEAUI54R833aH0RZSCTC0="; + hash = "sha256-U+h/WmTVwwUIBEOiNa/EKS6HvkeoGNmP3NpeP1fcqYw="; }; + vendorSha256 = "sha256-h/DpbXO+LUsB9NOAXUfNx3VOfEsiolfBEMBrAqVlU3A="; + proxyVendor = true; meta = with lib; { - homepage = "https://github.com/shizunge/endlessh-go"; description = "An implementation of endlessh exporting Prometheus metrics"; - license = licenses.gpl3; + homepage = "https://github.com/shizunge/endlessh-go"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ azahi ]; }; } diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index de64666ec77..96604042838 100644 --- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - sha256 = "sha256-tUmRWXdPu3nGj+dUBNvF7cRayMn8vCyA94vyUmQrfRk="; + sha256 = "sha256-ytnaygAVKppyyUnxfMlwf9GvHzt8SN5I+b2FTcyaM/4="; }; nativeBuildInputs = [ |