From 5e37ccce7d55dc87c498c7e10ebd953d9772d07f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 23 Aug 2021 12:29:22 +0200 Subject: [PATCH] prometheus-knot-exporter: 2020-01-30 -> 2021-08-21 The only change that is relevant for us is that my Knot fix is now part of the repo itself[1], so no need apply a patch anymore. [1] https://github.com/ghedo/knot_exporter/commit/b18eb7db735b50280f0815497475f4c7092a6550 --- .../monitoring/prometheus/knot-exporter.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index 42b6047d3d4f..bb9aaf587972 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -1,25 +1,16 @@ -{ stdenv, fetchFromGitHub, lib, python3, nixosTests, fetchpatch }: +{ stdenv, fetchFromGitHub, lib, python3, nixosTests }: stdenv.mkDerivation rec { pname = "knot-exporter"; - version = "unstable-2020-01-30"; + version = "unstable-2021-08-21"; src = fetchFromGitHub { owner = "ghedo"; repo = "knot_exporter"; - rev = "21dd46b401e0c1aea0b173e19462cdf89e1f444e"; - sha256 = "sha256-4au4lpaq3jcqC2JXdCcf8h+YN8Nmm4eE0kZwA+1rWlc="; + rev = "b18eb7db735b50280f0815497475f4c7092a6550"; + sha256 = "sha256-FGzkO/KHDhkM3PA2urNQcrMi3MHADkd0YwAvu1jvfrU="; }; - patches = [ - # Fixes a crash with all metrics enabled. See - # https://github.com/ghedo/knot_exporter/pull/6 for further context. - (fetchpatch { - url = "https://github.com/ghedo/knot_exporter/commit/2317476e080369450ae51a707ccd30d4b89d680f.patch"; - sha256 = "sha256-yEPu8EE1V/draNx9DeMrPj+bMfJRxauweo33dITl4AA="; - }) - ]; - dontBuild = true; nativeBuildInputs = [ python3.pkgs.wrapPython ];