maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(ops): Consistent use of depot.third_party vs. pkgs

Browse source 
In preparation for the solution of b/108, we need to consistently use
`depot.third_party` for packages that are only packed in the TVL depot
and `pkgs` for things that come from nixpkgs.

This commit cleans up a huge chunk of these uses in //ops

Change-Id: I00faeb969eaa70760a26256274925b07998c2351
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2915
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2021-04-10 13:40:06 +02:00 • committed by tazjin
parent d62fab4168
commit 9c5b5600ea
4 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ops/nixos/default.nix
View file

@ -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