From b2f4c85a6c1afb74b257a14dcce9236ae021fe4a Mon Sep 17 00:00:00 2001 From: Martin Fischer Date: Sat, 17 Oct 2026 10:19:47 +0200 Subject: refactor: pass sources via specialArgs --- nixos/shared/prometheus-sql-exporter/default.nix | 4 +--- nixos/shared/prometheus-sql-exporter/service.nix | 4 ++-- nixos/shared/prometheus-storagebox-exporter/default.nix | 4 +--- nixos/shared/prometheus-storagebox-exporter/service.nix | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) (limited to 'nixos/shared') diff --git a/nixos/shared/prometheus-sql-exporter/default.nix b/nixos/shared/prometheus-sql-exporter/default.nix index 5d80a62..e049396 100644 --- a/nixos/shared/prometheus-sql-exporter/default.nix +++ b/nixos/shared/prometheus-sql-exporter/default.nix @@ -1,10 +1,8 @@ { lib, buildGoModule, + sources, }: -let - sources = import ; -in buildGoModule { pname = "sql_exporter"; version = sources.prometheus-sql-exporter.version; diff --git a/nixos/shared/prometheus-sql-exporter/service.nix b/nixos/shared/prometheus-sql-exporter/service.nix index a79528c..3bbf5c2 100644 --- a/nixos/shared/prometheus-sql-exporter/service.nix +++ b/nixos/shared/prometheus-sql-exporter/service.nix @@ -1,8 +1,8 @@ # TODO: submit burningalchemist's sql_exporter to nixpkgs -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, sources, ... }: let - sqlExporter = pkgs.callPackage ./default.nix {}; + sqlExporter = pkgs.callPackage ./default.nix { inherit sources; }; cfg = config.services.prometheus-sql-exporter; configFile = builtins.toFile "config.yaml" (builtins.toJSON cfg.config); validateConfig = file: diff --git a/nixos/shared/prometheus-storagebox-exporter/default.nix b/nixos/shared/prometheus-storagebox-exporter/default.nix index 281290f..d4fd13e 100644 --- a/nixos/shared/prometheus-storagebox-exporter/default.nix +++ b/nixos/shared/prometheus-storagebox-exporter/default.nix @@ -1,10 +1,8 @@ { lib, buildGoModule, + sources, }: -let - sources = import ; -in buildGoModule { pname = "storagebox_exporter"; version = sources.prometheus-storagebox-exporter.version; diff --git a/nixos/shared/prometheus-storagebox-exporter/service.nix b/nixos/shared/prometheus-storagebox-exporter/service.nix index 74f0dd1..1d3cff5 100644 --- a/nixos/shared/prometheus-storagebox-exporter/service.nix +++ b/nixos/shared/prometheus-storagebox-exporter/service.nix @@ -1,8 +1,8 @@ # TODO: submit Christian's storagebox exporter to nixpkgs -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, sources, ... }: let - storageboxExporter = pkgs.callPackage ./default.nix {}; + storageboxExporter = pkgs.callPackage ./default.nix { inherit sources; }; cfg = config.services.prometheus-storagebox-exporter; in { -- cgit v1.3.1