From 5f19e8e6a73f7d76fa4bb62036891e824b64b515 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Mon, 19 Apr 2021 23:58:11 +0200 Subject: refactor(ops/nixos): Ensure that pkgs == depot.third_party.nixpkgs This is currently done ad-hoc in a bunch of our systems, but we should just do it centrally. The commit message is a bit of a lie, as this doesn't yet update grfn's systems. Change-Id: Ic771c1a1da78ec5de9cffbf94c296dce5e11fd84 Reviewed-on: https://cl.tvl.fyi/c/depot/+/3047 Tested-by: BuildkiteCI Reviewed-by: sterni --- users/tazjin/nixos/frog/default.nix | 7 ------- 1 file changed, 7 deletions(-) (limited to 'users/tazjin/nixos/frog/default.nix') diff --git a/users/tazjin/nixos/frog/default.nix b/users/tazjin/nixos/frog/default.nix index 05df8caab5..896c7e8c97 100644 --- a/users/tazjin/nixos/frog/default.nix +++ b/users/tazjin/nixos/frog/default.nix @@ -61,17 +61,10 @@ in lib.fix(self: { nix = { maxJobs = 48; - nixPath = [ - "depot=/depot" - "nixpkgs=${pkgs.path}" - ]; - binaryCaches = ["ssh://nix-ssh@whitby.tvl.fyi"]; binaryCachePublicKeys = ["cache.tvl.fyi:fd+9d1ceCPvDX/xVhcfv8nAa6njEhAGAEe+oGJDEeoc="]; }; - nixpkgs.pkgs = pkgs; - networking = { hostName = "frog"; useDHCP = true; -- cgit 1.4.1