From 97be9c1411aca437daa9eb95474ee134e727a3d9 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <tazjin@google.com>
Date: Mon, 9 Dec 2019 03:18:27 +0000
Subject: [PATCH] fix(third_party): Shuffle code around to be compatible with
 readTree

As per the previous commit these files were no longer being imported,
which is now fixed by moving them into separate subfolders.
---
 third_party/{naersk.nix => naersk/default.nix} | 0
 third_party/{nixery.nix => nixery/default.nix} | 6 +++---
 third_party/{ormolu.nix => ormolu/default.nix} | 4 ++--
 third_party/terraform-gcp.nix                  | 3 ---
 third_party/terraform-gcp/default.nix          | 3 +++
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename third_party/{naersk.nix => naersk/default.nix} (100%)
 rename third_party/{nixery.nix => nixery/default.nix} (75%)
 rename third_party/{ormolu.nix => ormolu/default.nix} (69%)
 delete mode 100644 third_party/terraform-gcp.nix
 create mode 100644 third_party/terraform-gcp/default.nix

diff --git a/third_party/naersk.nix b/third_party/naersk/default.nix
similarity index 100%
rename from third_party/naersk.nix
rename to third_party/naersk/default.nix
diff --git a/third_party/nixery.nix b/third_party/nixery/default.nix
similarity index 75%
rename from third_party/nixery.nix
rename to third_party/nixery/default.nix
index f778e5da1..b4c083765 100644
--- a/third_party/nixery.nix
+++ b/third_party/nixery/default.nix
@@ -2,17 +2,17 @@
 # outside of this repository ...
 { pkgs, ... }:
 
-let src = pkgs.fetchFromGitHub {
+let src = pkgs.third_party.fetchFromGitHub {
   owner = "google";
   repo = "nixery";
   rev = "4f6ce83f9296545d6c74321b37d18545764c8827";
   sha256 = "19aiak1pss6vwm0fwn02827l5ir78fkqglfbdl2gchsyv3gps8bg";
 };
 in import src {
-  inherit pkgs;
+  pkgs = pkgs.third_party;
   preLaunch = ''
     export USER=root
     cachix use tazjin
   '';
-  extraPackages = with pkgs; [ cachix ];
+  extraPackages = [ pkgs.third_party.cachix ];
 }
diff --git a/third_party/ormolu.nix b/third_party/ormolu/default.nix
similarity index 69%
rename from third_party/ormolu.nix
rename to third_party/ormolu/default.nix
index 3175e25ff..eed5c7981 100644
--- a/third_party/ormolu.nix
+++ b/third_party/ormolu/default.nix
@@ -1,8 +1,8 @@
 { pkgs, ... }:
 
-import (pkgs.fetchFromGitHub {
+import (pkgs.third_party.fetchFromGitHub {
   owner = "tweag";
   repo = "ormolu";
   rev = "a7076c0f83e5c06ea9067b71171859fa2ba8afd9";
   sha256 = "1p4n2ja4ciw3qfskn65ggpy37mvgf2sslxqmqn8s8jjarnqcyfny";
-}) { inherit pkgs; }
+}) { pkgs = pkgs.third_party; }
diff --git a/third_party/terraform-gcp.nix b/third_party/terraform-gcp.nix
deleted file mode 100644
index 3332c12e4..000000000
--- a/third_party/terraform-gcp.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.terraform_0_12.withPlugins(p: [ p.google p.google-beta ])
diff --git a/third_party/terraform-gcp/default.nix b/third_party/terraform-gcp/default.nix
new file mode 100644
index 000000000..465b74e4e
--- /dev/null
+++ b/third_party/terraform-gcp/default.nix
@@ -0,0 +1,3 @@
+{ pkgs, ... }:
+
+pkgs.third_party.terraform_0_12.withPlugins(p: [ p.google p.google-beta ])