From 46e5a23937c68d89d1d080ad6feef7587bcdbdc8 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Mon, 9 Dec 2019 02:54:35 +0000
Subject: [PATCH] fix: Amend import paths to use whitelisted nixpkgs

---
 services/tazblog/default.nix | 2 +-
 third_party/naersk.nix       | 2 +-
 tools/blog_cli/default.nix   | 2 +-
 tools/kms_pass.nix           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/tazblog/default.nix b/services/tazblog/default.nix
index 41838e760..eecadff6b 100644
--- a/services/tazblog/default.nix
+++ b/services/tazblog/default.nix
@@ -5,7 +5,7 @@
 { pkgs, ... }:
 
 let
-  inherit (pkgs.third_party.nixpkgs) writeShellScriptBin haskell;
+  inherit (pkgs.third_party) writeShellScriptBin haskell;
   tazblog = haskell.packages.ghc865.callPackage ./tazblog.nix {};
   wrapper =  writeShellScriptBin "tazblog" ''
     export PORT=8000
diff --git a/third_party/naersk.nix b/third_party/naersk.nix
index 0e708a578..918f0c5c0 100644
--- a/third_party/naersk.nix
+++ b/third_party/naersk.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-let inherit (pkgs.third_party.nixpkgs) callPackage fetchFromGitHub;
+let inherit (pkgs.third_party) callPackage fetchFromGitHub;
 in callPackage (fetchFromGitHub {
   owner = "nmattia";
   repo = "naersk";
diff --git a/tools/blog_cli/default.nix b/tools/blog_cli/default.nix
index 76732667f..ed283f744 100644
--- a/tools/blog_cli/default.nix
+++ b/tools/blog_cli/default.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }:
 
-pkgs.third_party.nixpkgs.buildGoPackage {
+pkgs.third_party.buildGoPackage {
   name = "blog_cli";
   goPackagePath = "github.com/tazjin/personal/blog_cli";
   src = ./.;
diff --git a/tools/kms_pass.nix b/tools/kms_pass.nix
index 82a6a9f1f..14989b392 100644
--- a/tools/kms_pass.nix
+++ b/tools/kms_pass.nix
@@ -8,7 +8,7 @@
 
 { pkgs, kms, ... }:
 
-let inherit (pkgs.third_party.nixpkgs) google-cloud-sdk tree writeShellScriptBin;
+let inherit (pkgs.third_party) google-cloud-sdk tree writeShellScriptBin;
 in (writeShellScriptBin "pass" ''
   set -eo pipefail