diff options
Diffstat (limited to 'ops/nixos')
| -rw-r--r-- | ops/nixos/default.nix | 9 | ||||
| -rw-r--r-- | ops/nixos/tvl-buildkite.nix | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ops/nixos/default.nix b/ops/nixos/default.nix index e6cb1a760a2e..fc3508b52919 100644 --- a/ops/nixos/default.nix +++ b/ops/nixos/default.nix @@ -6,13 +6,12 @@ # # TODO(tazjin): Find a more elegant solution for the whole module # situation. -{ lib, pkgs, depot, ... }@args: +{ depot, lib, pkgs, ... }@args: let inherit (lib) findFirst isAttrs; -in - -rec { + nixos = import "${depot.third_party.nixpkgsSrc}/nixos"; +in rec { whitby = import ./whitby/default.nix args; # System installation @@ -26,7 +25,7 @@ rec { }; }; - nixosFor = configuration: (depot.third_party.nixos { + nixosFor = configuration: (nixos { configuration = { ... }: { imports = [ baseModule diff --git a/ops/nixos/tvl-buildkite.nix b/ops/nixos/tvl-buildkite.nix index 4ea92b6eeab0..c6dcbd3bc1e8 100644 --- a/ops/nixos/tvl-buildkite.nix +++ b/ops/nixos/tvl-buildkite.nix @@ -1,5 +1,5 @@ # Configuration for the TVL buildkite agents. -{ config, depot, lib, ... }: +{ config, depot, pkgs, lib, ... }: let cfg = config.services.depot.buildkite; @@ -8,7 +8,7 @@ let # All Buildkite hooks are actually besadii, but it's being invoked # with different names. - buildkiteHooks = depot.third_party.runCommandNoCC "buildkite-hooks" {} '' + buildkiteHooks = pkgs.runCommandNoCC "buildkite-hooks" {} '' mkdir -p $out/bin ln -s ${depot.ops.besadii}/bin/besadii $out/bin/post-command ''; |