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.
This commit is contained in:
Vincent Ambo 2019-12-09 03:18:27 +00:00
parent ff38ae6c5f
commit 97be9c1411
5 changed files with 8 additions and 8 deletions

View file

@ -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 ];
}

View file

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

View file

@ -1,3 +0,0 @@
{ pkgs, ... }:
pkgs.terraform_0_12.withPlugins(p: [ p.google p.google-beta ])

3
third_party/terraform-gcp/default.nix vendored Normal file
View file

@ -0,0 +1,3 @@
{ pkgs, ... }:
pkgs.third_party.terraform_0_12.withPlugins(p: [ p.google p.google-beta ])