diff --git a/flake.nix b/flake.nix index c9c7ab41..29f3bbb1 100644 --- a/flake.nix +++ b/flake.nix @@ -140,9 +140,7 @@ then hostConf.ip4 else throw "Host ${name} has no ip4 or ip6 address"; in { - overlay = import ./overlay { - inherit nixos-unstable; - }; + overlay = import ./overlay; legacyPackages = lib.attrsets.mapAttrs (system: pkgs: pkgs.appendOverlays diff --git a/modules/cluster/default.nix b/modules/cluster/default.nix index c9adbbcf..44a9cca9 100644 --- a/modules/cluster/default.nix +++ b/modules/cluster/default.nix @@ -82,6 +82,6 @@ in { environment.systemPackages = with pkgs; [ # nomad frontends - damon wander + damon ]; } diff --git a/overlay/default.nix b/overlay/default.nix index f8efae4d..a1e7314c 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -1,11 +1,5 @@ -{ nixos-unstable }: - final: prev: -let - pkgs-unstable = nixos-unstable.legacyPackages.${prev.system}; - -in { bmxd = prev.callPackage ./bmxd.nix { }; @@ -56,10 +50,4 @@ in readsb = prev.callPackage ./readsb.nix { }; SimpleYggGen-CPP = prev.callPackage ./simpleygggen.nix { }; - - wander = - if prev ? wander - then builtins.trace "`wander` is now available on stable NixOS. Please remove from overlay!" - prev.wander - else pkgs-unstable.wander; }