From 0c71fc9d1d49daa914c0f56f4f9201d40415d9b4 Mon Sep 17 00:00:00 2001
From: William Carroll <wpcarro@gmail.com>
Date: Tue, 18 Aug 2020 12:00:17 +0100
Subject: 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
---
 scratch/deepmind/part_two/.envrc         | 1 +
 scratch/deepmind/part_two/dir-locals.nix | 3 ---
 scratch/deepmind/part_two/shell.nix      | 3 ++-
 3 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 scratch/deepmind/part_two/dir-locals.nix

(limited to 'scratch/deepmind')

diff --git a/scratch/deepmind/part_two/.envrc b/scratch/deepmind/part_two/.envrc
index 1abb058f60d5..a4a62da526d3 100644
--- a/scratch/deepmind/part_two/.envrc
+++ b/scratch/deepmind/part_two/.envrc
@@ -1 +1,2 @@
 source_up
+use_nix
diff --git a/scratch/deepmind/part_two/dir-locals.nix b/scratch/deepmind/part_two/dir-locals.nix
deleted file mode 100644
index 498f4b5055f8..000000000000
--- a/scratch/deepmind/part_two/dir-locals.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-let
-  briefcase = import <briefcase> {};
-in briefcase.utils.nixBufferFromShell ./shell.nix
diff --git a/scratch/deepmind/part_two/shell.nix b/scratch/deepmind/part_two/shell.nix
index 65de884696d0..6080171bb835 100644
--- a/scratch/deepmind/part_two/shell.nix
+++ b/scratch/deepmind/part_two/shell.nix
@@ -1,5 +1,6 @@
 let
-  pkgs = import <nixpkgs> {};
+  briefcase = import <briefcase> {};
+  pkgs = briefcase.third_party.pkgs;
 in pkgs.mkShell {
   buildInputs = with pkgs; [
     nodejs
-- 
cgit 1.4.1