From b6d143e5d225e6aa293c23512336b7136ac58dcf Mon Sep 17 00:00:00 2001 From: William Carroll Date: Mon, 13 Dec 2021 19:51:48 -0800 Subject: fix(wpcarro/nix): Remove references Angle-bracketed references are a Nix anti-pattern, and thankfully this repository enforces this as a standard. TL;DR: - Drop angle-bracketed references - Change `briefcase` -> `users.wpcarro` - Fix any resulting regressions - Fix //users/wpcarro/tools/simple_vim - Mark //users/wpcarro/boilerplate/typescript and related projects as broken - drop .skip-subtree file, enabling depot CI Change-Id: I7153cbabafa617bfd6b199370cbec65cb75441f6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/4325 Tested-by: BuildkiteCI Reviewed-by: wpcarro Reviewed-by: tazjin Reviewed-by: grfn Autosubmit: wpcarro --- users/wpcarro/assessments/tt/client/dir-locals.nix | 3 --- users/wpcarro/assessments/tt/client/shell.nix | 6 +++--- users/wpcarro/assessments/tt/shell.nix | 3 ++- 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 users/wpcarro/assessments/tt/client/dir-locals.nix (limited to 'users/wpcarro/assessments/tt') diff --git a/users/wpcarro/assessments/tt/client/dir-locals.nix b/users/wpcarro/assessments/tt/client/dir-locals.nix deleted file mode 100644 index 5c3ae08870..0000000000 --- a/users/wpcarro/assessments/tt/client/dir-locals.nix +++ /dev/null @@ -1,3 +0,0 @@ -let - briefcase = import /home/wpcarro/briefcase {}; -in briefcase.utils.nixBufferFromShell ./shell.nix diff --git a/users/wpcarro/assessments/tt/client/shell.nix b/users/wpcarro/assessments/tt/client/shell.nix index 15ac040b94..78f55385db 100644 --- a/users/wpcarro/assessments/tt/client/shell.nix +++ b/users/wpcarro/assessments/tt/client/shell.nix @@ -1,6 +1,6 @@ -let - pkgs = import {}; -in pkgs.mkShell { +{ pkgs, ... }: + +pkgs.mkShell { buildInputs = with pkgs; [ nodejs elmPackages.elm diff --git a/users/wpcarro/assessments/tt/shell.nix b/users/wpcarro/assessments/tt/shell.nix index 567b71060b..88761e5399 100644 --- a/users/wpcarro/assessments/tt/shell.nix +++ b/users/wpcarro/assessments/tt/shell.nix @@ -1,5 +1,6 @@ +{ pkgs, depot, ... }: + let - pkgs = import {}; hailgun-src = builtins.fetchGit { url = "https://bitbucket.org/echo_rm/hailgun.git"; rev = "9d5da7c902b2399e0fcf3d494ee04cf2bbfe7c9e"; -- cgit 1.4.1