diff options
-rw-r--r-- | third_party/naersk/default.nix (renamed from third_party/naersk.nix) | 0 | ||||
-rw-r--r-- | third_party/nixery/default.nix (renamed from third_party/nixery.nix) | 6 | ||||
-rw-r--r-- | third_party/ormolu/default.nix (renamed from third_party/ormolu.nix) | 4 | ||||
-rw-r--r-- | third_party/terraform-gcp.nix | 3 | ||||
-rw-r--r-- | third_party/terraform-gcp/default.nix | 3 |
5 files changed, 8 insertions, 8 deletions
diff --git a/third_party/naersk.nix b/third_party/naersk/default.nix index 918f0c5c0f55..918f0c5c0f55 100644 --- a/third_party/naersk.nix +++ b/third_party/naersk/default.nix diff --git a/third_party/nixery.nix b/third_party/nixery/default.nix index f778e5da13f9..b4c083765184 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 index 3175e25ff138..eed5c7981e43 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 3332c12e41bc..000000000000 --- 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 000000000000..465b74e4e1b9 --- /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 ]) |