Drop support for dir-locals.nix, <nixpkgs>, etc.

In the spirit of Marie Kondo, I'm tidying up!

TL;DR:
- Prefer .envrc `use_nix` and delete all dir-locals.nix files
- Remove ~all references to <nixpkgs>, <unstable>, <depot> and prefer
  referencing each with briefcase.third_party.{pkgs,unstable,depot}
- Delete nixBufferFromShell function since I was only using that in
  dir-locals.nix files

9 files changed, 15 insertions, 20 deletions

diff --git a/tools/monzo_ynab/.envrc b/tools/monzo_ynab/.envrc
index 14829cb12390..9b234477352d 100644
--- a/tools/monzo_ynab/.envrc
+++ b/tools/monzo_ynab/.envrc
@@ -1,4 +1,5 @@
 source_up
+use_nix
 export monzo_client_id="$(pass show finance/monzo/client-id)"
 export monzo_client_secret="$(pass show finance/monzo/client-secret)"
 export ynab_personal_access_token="$(pass show finance/youneedabudget.com/personal-access-token)"
diff --git a/tools/monzo_ynab/dir-locals.nix b/tools/monzo_ynab/dir-locals.nix
deleted file mode 100644
index 498f4b5055f8..000000000000
--- a/tools/monzo_ynab/dir-locals.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-let
-  briefcase = import <briefcase> {};
-in briefcase.utils.nixBufferFromShell ./shell.nix
diff --git a/tools/monzo_ynab/shell.nix b/tools/monzo_ynab/shell.nix
index aab4123bff9a..910d7c1829e2 100644
--- a/tools/monzo_ynab/shell.nix
+++ b/tools/monzo_ynab/shell.nix
@@ -1,5 +1,6 @@
 let
-  pkgs = import <nixpkgs> {};
+  briefcase = import <briefcase> {};
+  pkgs = briefcase.third_party.pkgs;
 in pkgs.mkShell {
   buildInputs = [
     pkgs.go
diff --git a/tools/run/.envrc b/tools/run/.envrc
index 1abb058f60d5..a4a62da526d3 100644
--- a/tools/run/.envrc
+++ b/tools/run/.envrc
@@ -1 +1,2 @@
 source_up
+use_nix
diff --git a/tools/run/dir-locals.nix b/tools/run/dir-locals.nix
deleted file mode 100644
index 498f4b5055f8..000000000000
--- a/tools/run/dir-locals.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-let
-  briefcase = import <briefcase> {};
-in briefcase.utils.nixBufferFromShell ./shell.nix
diff --git a/tools/run/shell.nix b/tools/run/shell.nix
index 97d8ed61ec59..e14bffae487c 100644
--- a/tools/run/shell.nix
+++ b/tools/run/shell.nix
@@ -1,5 +1,6 @@
 let
-  pkgs = import <nixpkgs> {};
+  briefcase = import <briefcase> {};
+  pkgs = briefcase.third_party.pkgs;
 in pkgs.mkShell {
   buildInputs = with pkgs; [
     go
diff --git a/tools/url-blocker/.envrc b/tools/url-blocker/.envrc
index 1abb058f60d5..a4a62da526d3 100644
--- a/tools/url-blocker/.envrc
+++ b/tools/url-blocker/.envrc
@@ -1 +1,2 @@
 source_up
+use_nix
diff --git a/tools/url-blocker/default.nix b/tools/url-blocker/default.nix
index 5d1b8cd1666a..943644e5f542 100644
--- a/tools/url-blocker/default.nix
+++ b/tools/url-blocker/default.nix
@@ -1,8 +1,6 @@
-{ ... }:
+{ pkgs, ... }:
 
 let
-  pkgs = import <unstable> {};
-
   ghc = pkgs.haskellPackages.ghcWithPackages (hpkgs: [
     hpkgs.time
     hpkgs.aeson
diff --git a/tools/url-blocker/shell.nix b/tools/url-blocker/shell.nix
index 40f217e3f9a7..1adc566c0121 100644
--- a/tools/url-blocker/shell.nix
+++ b/tools/url-blocker/shell.nix
@@ -1,12 +1,10 @@
 let
-  pkgs = import <unstable> {};
-in pkgs.mkShell {
-  buildInputs = with pkgs; [
-    (haskellPackages.ghcWithPackages (hpkgs: with hpkgs; [
-      time
-      aeson
-      either
-      hspec
-    ]))
+  briefcase = import <briefcase> {};
+in briefcase.buildHaskell.shell {
+  deps = hpkgs: with hpkgs; [
+    time
+    aeson
+    either
+    hspec
   ];
 }