diff --git a/flake.nix b/flake.nix index 500420cf..e0e06255 100644 --- a/flake.nix +++ b/flake.nix @@ -131,7 +131,9 @@ then hostConf.ip4 else throw "Host ${name} has no ip4 or ip6 address"; in { - overlay = import ./overlay; + overlay = import ./overlay { + inherit nixos-unstable; + }; legacyPackages = lib.attrsets.mapAttrs (system: pkgs: pkgs.appendOverlays diff --git a/modules/cluster/default.nix b/modules/cluster/default.nix index 44a9cca9..c9adbbcf 100644 --- a/modules/cluster/default.nix +++ b/modules/cluster/default.nix @@ -82,6 +82,6 @@ in { environment.systemPackages = with pkgs; [ # nomad frontends - damon + damon wander ]; } diff --git a/overlay/default.nix b/overlay/default.nix index a1e7314c..f8efae4d 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -1,5 +1,11 @@ +{ nixos-unstable }: + final: prev: +let + pkgs-unstable = nixos-unstable.legacyPackages.${prev.system}; + +in { bmxd = prev.callPackage ./bmxd.nix { }; @@ -50,4 +56,10 @@ final: prev: 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; }