diff --git a/flake.nix b/flake.nix index a0a57cbd..2c2ede4f 100644 --- a/flake.nix +++ b/flake.nix @@ -179,7 +179,7 @@ }; }; - outputs = inputs@{ self, alert2muc, fenix, harmonia, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-unstable, nixos-unstable-simd, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }: + outputs = inputs@{ self, alert2muc, fenix, harmonia, heliwatch, microvm, naersk, nixos, nixos-hardware, nixos-unstable, caveman, oparl-scraper, scrapers, secrets, skyflake, sshlogd, sops-nix, spacemsg, ticker, tigger, yammat, zentralwerk, ... }: let inherit (nixos) lib; @@ -240,7 +240,6 @@ }; in { overlays = import ./overlays { - inherit nixos-unstable; inherit (inputs) tracer bevy-mandelbrot bevy-julia; }; diff --git a/hosts/prometheus/default.nix b/hosts/prometheus/default.nix index 61db242e..feabdf50 100644 --- a/hosts/prometheus/default.nix +++ b/hosts/prometheus/default.nix @@ -35,7 +35,7 @@ }; "receivers" = [{ "name" = "xmpp"; - "webhook_configs" = with config.services.prometheus.xmpp-alerts.settings; [{ + "webhook_configs" = [{ "url" = "http://127.0.0.1:9022/"; }]; }]; diff --git a/hosts/radiobert/base.nix b/hosts/radiobert/base.nix deleted file mode 100644 index e69de29b..00000000 diff --git a/overlays/default.nix b/overlays/default.nix index ebd36aee..268ab659 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,14 +1,10 @@ -{ nixos-unstable -, tracer -, bevy-julia +{ bevy-julia , bevy-mandelbrot +, tracer }: final: prev: -let - pkgs-unstable = nixos-unstable.legacyPackages.${prev.system}; -in with final; { allcolors = callPackage ./allcolors.nix { }; @@ -64,7 +60,7 @@ with final; { mlat-client = python3Packages.callPackage ./mlat-client.nix { }; - openssh = prev.openssh.overrideAttrs (oldAttrs: { + openssh = prev.openssh.overrideAttrs (_: { # takes 30 minutes doCheck = false; }); diff --git a/overlays/telme10.nix b/overlays/telme10.nix index f692d629..b0a55288 100644 --- a/overlays/telme10.nix +++ b/overlays/telme10.nix @@ -1,5 +1,4 @@ -{ stdenv -, buildGoModule +{ buildGoModule , fetchFromGitHub }: