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/zoo/default.nix | 4 ++-- users/wpcarro/zoo/shell.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'users/wpcarro/zoo') diff --git a/users/wpcarro/zoo/default.nix b/users/wpcarro/zoo/default.nix index 35de24d9c2cc..312a6cbd7689 100644 --- a/users/wpcarro/zoo/default.nix +++ b/users/wpcarro/zoo/default.nix @@ -1,6 +1,6 @@ -{ briefcase, ... }: +{ depot, ... }: -briefcase.buildHaskell.program { +depot.users.wpcarro.buildHaskell.program { name = "zoo"; srcs = builtins.path { path = ./.; diff --git a/users/wpcarro/zoo/shell.nix b/users/wpcarro/zoo/shell.nix index 944c5acc7f28..5978d5b4d04a 100644 --- a/users/wpcarro/zoo/shell.nix +++ b/users/wpcarro/zoo/shell.nix @@ -1,6 +1,6 @@ -let - briefcase = import {}; -in briefcase.buildHaskell.shell { +{ depot, ... }: + +depot.users.wpcarro.buildHaskell.shell { deps = hpkgs: with hpkgs; [ servant-server aeson -- cgit 1.4.1