Skip to content

Commit

Permalink
chore: upgrade nixos
Browse files Browse the repository at this point in the history
  • Loading branch information
mkg20001 committed Jul 2, 2024
1 parent 5a04f06 commit d4b4c4f
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 10 deletions.
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,21 @@
supportedSystems = [ "x86_64-linux" "aarch64-linux" ];
forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);

patchPkgs = patches4nixpkgs.patch inputs.nixpkgs [ mgit-exporter ];
patchPkgs = patches4nixpkgs.patch inputs.nixpkgs [ mgit-exporter self ];
nixpkgs = patches4nixpkgs.eval patchPkgs;
in {
overlays.default = final: prev:
(import ./overlay.nix final prev) // (inputs.mgit-exporter.overlays.default final prev);

inherit nixpkgs;

patches4nixpkgs = nixpkgs: [
[
true
./patches/prometheus-exporter-errors.patch
]
];

packages = forAllSystems (system:
let
pkgs = import "${nixpkgs}" {
Expand Down
28 changes: 28 additions & 0 deletions patches/prometheus-exporter-errors.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 07abb70bedacadcd3c62029a18ed3f76cbe4f4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <[email protected]>
Date: Tue, 2 Jul 2024 13:25:03 +0200
Subject: [PATCH] prometheus exporter remove errors

---
nixos/modules/services/monitoring/prometheus/exporters.nix | 5 -----
1 file changed, 5 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index dc357f6cc5fb..a472fe9694fa 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -283,11 +283,6 @@ in
options = (mkSubModules);
imports = [
../../../misc/assertions.nix
- (lib.mkRenamedOptionModule [ "unifi-poller" ] [ "unpoller" ])
- (lib.mkRemovedOptionModule [ "minio" ] ''
- The Minio exporter has been removed, as it was broken and unmaintained.
- See the 24.11 release notes for more information.
- '')
];
};
description = "Prometheus exporter configuration";
--
2.45.1

0 comments on commit d4b4c4f

Please sign in to comment.