lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

depot: fix up things

Browse source
This commit is contained in:
Luke Granger-Brown 2020-11-01 21:39:25 +00:00
parent 75aef1e3ca
commit 847e827d0a
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ci-root.nix
View file

@ -7,7 +7,7 @@ let
pkgs = depot.third_party.nixpkgs; pkgs = depot.third_party.nixpkgs;
lib = pkgs.lib; lib = pkgs.lib;
prefixAttrs = prefix: lib.mapAttrsToList (name: value: { name = "${prefix}-${name}"; path = value; }); prefixAttrs = prefix: lib.mapAttrsToList (name: value: { name = "${prefix}-${name}"; path = value; });
ciMachines = prefixAttrs "machine" depot.ops.nixos; ciMachines = prefixAttrs "machine" depot.ops.nixos.systems;
ciPackages = prefixAttrs "pkg" depot.nix.pkgs; ciPackages = prefixAttrs "pkg" depot.nix.pkgs;
ciDocker = prefixAttrs "docker" ((import ./docker-images.nix).images); ciDocker = prefixAttrs "docker" ((import ./docker-images.nix).images);

1
ops/nixos/default.nix
View file

@ -23,5 +23,6 @@ let
systemDrvs = mapAttrs (_: sys: sys.config.system.build.toplevel) evaledSystems; systemDrvs = mapAttrs (_: sys: sys.config.system.build.toplevel) evaledSystems;
systemTailscaleIPs = lib.mapAttrs' (n: v: lib.nameValuePair v [n]) (lib.filterAttrs (n: v: v != null) (mapAttrs (_: sys: sys.config.my.ip.tailscale) evaledSystems)); systemTailscaleIPs = lib.mapAttrs' (n: v: lib.nameValuePair v [n]) (lib.filterAttrs (n: v: v != null) (mapAttrs (_: sys: sys.config.my.ip.tailscale) evaledSystems));
in systemDrvs // { in systemDrvs // {
systems = systemDrvs;
tailscaleIPs = systemTailscaleIPs; tailscaleIPs = systemTailscaleIPs;
} }

2
third_party/default.nix vendored
View file

@ -46,5 +46,5 @@ rec {
readTree = import ./tvl/nix/readTree {}; readTree = import ./tvl/nix/readTree {};
gopkgs = readTree ch ./gopkgs; gopkgs = readTree ch ./gopkgs;
crate2nix = import "${crate2nixSrc}" {}; crate2nix = import "${crate2nixSrc}" { pkgs = ch.depot.pkgs; };
} }