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/scratch/deepmind/part_two/shell.nix | 7 +++---- users/wpcarro/scratch/groceries/shell.nix | 6 +++--- .../scratch/haskell-programming-from-first-principles/shell.nix | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) (limited to 'users/wpcarro/scratch') diff --git a/users/wpcarro/scratch/deepmind/part_two/shell.nix b/users/wpcarro/scratch/deepmind/part_two/shell.nix index 6080171bb8..f1b02c4d2e 100644 --- a/users/wpcarro/scratch/deepmind/part_two/shell.nix +++ b/users/wpcarro/scratch/deepmind/part_two/shell.nix @@ -1,7 +1,6 @@ -let - briefcase = import {}; - pkgs = briefcase.third_party.pkgs; -in pkgs.mkShell { +{ pkgs, ... }: + +pkgs.mkShell { buildInputs = with pkgs; [ nodejs python3 diff --git a/users/wpcarro/scratch/groceries/shell.nix b/users/wpcarro/scratch/groceries/shell.nix index 4d5b412a08..7682e8246c 100644 --- a/users/wpcarro/scratch/groceries/shell.nix +++ b/users/wpcarro/scratch/groceries/shell.nix @@ -1,5 +1,5 @@ -let - briefcase = import {}; -in briefcase.buildHaskell.shell { +{ depot, ... }: + +depot.users.wpcarro.buildHaskell.shell { deps = hpkgs: []; } diff --git a/users/wpcarro/scratch/haskell-programming-from-first-principles/shell.nix b/users/wpcarro/scratch/haskell-programming-from-first-principles/shell.nix index b594a4207e..49dbe746d3 100644 --- a/users/wpcarro/scratch/haskell-programming-from-first-principles/shell.nix +++ b/users/wpcarro/scratch/haskell-programming-from-first-principles/shell.nix @@ -1,6 +1,6 @@ -let - briefcase = import {}; -in briefcase.buildHaskell.shell { +{ depot, ... }: + +depot.users.wpcarro.buildHaskell.shell { deps = hpkgs: with hpkgs; [ quickcheck-simple checkers -- cgit 1.4.1