From 4bbbb58cb537014dd8b0b3c3c560c039ac57ad89 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Fri, 21 Feb 2020 12:47:29 +0000
Subject: chore: Rename pkgs->depot in all Nix file headers

---
 overrides/default.nix               | 21 +++------------------
 overrides/elmPackages/default.nix   |  2 +-
 overrides/kontemplate/default.nix   |  4 ++--
 overrides/writeElispBin/default.nix |  4 ++--
 4 files changed, 8 insertions(+), 23 deletions(-)

(limited to 'overrides')

diff --git a/overrides/default.nix b/overrides/default.nix
index 2159d45bd0..8bc49dec47 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -1,28 +1,13 @@
 # This file is used to move things from nested attribute sets to the
 # top-level.
-{ pkgs, ... }:
+{ depot, ... }:
 
 {
-  buildGo = pkgs.nix.buildGo;
-
-  # These packages must be exposed at the top-level for compatibility
-  # with Nixery.
-  inherit (pkgs.third_party)
-    bashInteractive
-    cacert
-    coreutils
-    iana-etc
-    jq
-    moreutils
-    nano
-    openssl
-    runCommand
-    symlinkJoin
-    writeText;
+  buildGo = depot.nix.buildGo; # TODO(tazjin): remove this
 
   # These packages must be exposed for compatibility with buildGo.
   #
   # Despite buildGo being tracked in this tree, I want it to be possible
   # for external users to import it with the default nixpkgs layout.
-  inherit (pkgs.third_party) go ripgrep;
+  inherit (depot.third_party) go ripgrep;
 }
diff --git a/overrides/elmPackages/default.nix b/overrides/elmPackages/default.nix
index 20026d9180..3df44420a6 100644
--- a/overrides/elmPackages/default.nix
+++ b/overrides/elmPackages/default.nix
@@ -2,7 +2,7 @@
 # the newer version is a lot of effort.
 { pkgs, ... }:
 
-(import (pkgs.third_party.fetchFromGitHub {
+(import (pkgs.fetchFromGitHub {
   owner = "NixOS";
   repo = "nixpkgs";
   rev = "14f9ee66e63077539252f8b4550049381a082518";
diff --git a/overrides/kontemplate/default.nix b/overrides/kontemplate/default.nix
index 52da1ba32c..6147d1f465 100644
--- a/overrides/kontemplate/default.nix
+++ b/overrides/kontemplate/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, ... }:
+{ depot, ... }:
 
-with pkgs;
+with depot;
 
 third_party.writeShellScriptBin "kontemplate" ''
   export PATH="${ops.kms_pass}/bin:$PATH"
diff --git a/overrides/writeElispBin/default.nix b/overrides/writeElispBin/default.nix
index a1616fb9d4..8fd61f3948 100644
--- a/overrides/writeElispBin/default.nix
+++ b/overrides/writeElispBin/default.nix
@@ -1,9 +1,9 @@
 { pkgs, ... }:
 
-{ name, src, deps ? (_: []), emacs ? pkgs.third_party.emacs26-nox }:
+{ name, src, deps ? (_: []), emacs ? pkgs.emacs26-nox }:
 
 let
-  inherit (pkgs.third_party) emacsPackagesNg emacsPackagesNgGen writeTextFile;
+  inherit (pkgs) emacsPackagesNg emacsPackagesNgGen writeTextFile;
   inherit (builtins) isString toFile;
 
   finalEmacs = (emacsPackagesNgGen emacs).emacsWithPackages deps;
-- 
cgit 1.4.1