hydra: fix overlay to restore wander from nixos-unstable
This commit is contained in:
parent
bd0479c4b5
commit
e1f7b84669
11
flake.nix
11
flake.nix
|
@ -140,7 +140,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
|
||||
|
@ -576,12 +578,13 @@
|
|||
inputs.hydra.nixosModules.hydra
|
||||
./hosts/hydra
|
||||
{
|
||||
_module.args = {
|
||||
inherit self;
|
||||
inherit (inputs) hydra-ca;
|
||||
};
|
||||
sops.defaultSopsFile = "${secrets}/hosts/hydra/secrets.yaml";
|
||||
}
|
||||
];
|
||||
specialArgs = {
|
||||
hydra-ca = inputs.hydra-ca;
|
||||
};
|
||||
};
|
||||
|
||||
mucbot = nixosSystem' {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ hostRegistry, hydra-ca, config, lib, pkgs, ... }:
|
||||
{ self, hostRegistry, hydra-ca, config, lib, pkgs, ... }:
|
||||
{
|
||||
containers = {
|
||||
hydra-ca = {
|
||||
|
@ -30,7 +30,7 @@
|
|||
'';
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [ (import ../../overlay) ];
|
||||
nixpkgs.overlays = [ self.overlay ];
|
||||
|
||||
services = {
|
||||
hydra-dev = lib.recursiveUpdate config.services.hydra-dev {
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
{ nixos-unstable }:
|
||||
|
||||
final: prev:
|
||||
|
||||
{
|
||||
|
@ -50,4 +52,14 @@ 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 prev.callPackage (nixos-unstable + "/pkgs/tools/admin/wander") {
|
||||
lib = prev.lib // {
|
||||
teams.c3d2.members = [];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue