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
---
 website/sandbox/contentful/.envrc               | 1 +
 website/sandbox/contentful/default.nix          | 6 +++---
 website/sandbox/contentful/shell.nix            | 3 ++-
 website/sandbox/covid-uk/shell.nix              | 3 ++-
 website/sandbox/learnpianochords/.envrc         | 2 ++
 website/sandbox/learnpianochords/dir-locals.nix | 3 ---
 website/sandbox/learnpianochords/shell.nix      | 8 ++++----
 7 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 website/sandbox/learnpianochords/.envrc
 delete mode 100644 website/sandbox/learnpianochords/dir-locals.nix

(limited to 'website/sandbox')

diff --git a/website/sandbox/contentful/.envrc b/website/sandbox/contentful/.envrc
index a6b0e978f430..98e1d2c821f9 100644
--- a/website/sandbox/contentful/.envrc
+++ b/website/sandbox/contentful/.envrc
@@ -1,3 +1,4 @@
 source_up
+use_nix
 export CONTENTFUL_SPACE_ID="$(pass show programming/contentful/space-id)"
 export CONTENTFUL_ACCESS_TOKEN="$(pass show programming/contentful/access-token)"
diff --git a/website/sandbox/contentful/default.nix b/website/sandbox/contentful/default.nix
index 00714f45d098..f7125655ccdc 100644
--- a/website/sandbox/contentful/default.nix
+++ b/website/sandbox/contentful/default.nix
@@ -1,6 +1,6 @@
-let
-  pkgs = import <nixpkgs> {};
-in pkgs.stdenv.mkDerivation {
+{ pkgs, ... }:
+
+pkgs.stdenv.mkDerivation {
   name = "ideal-website";
   src = builtins.path { path = ./.; name = "contentful"; };
   buildInputs = with pkgs; [
diff --git a/website/sandbox/contentful/shell.nix b/website/sandbox/contentful/shell.nix
index ec2a1ce833fa..083254beefd0 100644
--- a/website/sandbox/contentful/shell.nix
+++ b/website/sandbox/contentful/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
diff --git a/website/sandbox/covid-uk/shell.nix b/website/sandbox/covid-uk/shell.nix
index 38df7d4e8508..6442c39f9c47 100644
--- a/website/sandbox/covid-uk/shell.nix
+++ b/website/sandbox/covid-uk/shell.nix
@@ -1,5 +1,6 @@
 let
-  pkgs = import <nixpkgs> {};
+  briefcase = import <briefcase> {};
+  pkgs = briefcase.third_party.pkgs;
 in pkgs.mkShell {
   buildInputs = with pkgs; [
     yarn
diff --git a/website/sandbox/learnpianochords/.envrc b/website/sandbox/learnpianochords/.envrc
new file mode 100644
index 000000000000..a4a62da526d3
--- /dev/null
+++ b/website/sandbox/learnpianochords/.envrc
@@ -0,0 +1,2 @@
+source_up
+use_nix
diff --git a/website/sandbox/learnpianochords/dir-locals.nix b/website/sandbox/learnpianochords/dir-locals.nix
deleted file mode 100644
index 498f4b5055f8..000000000000
--- a/website/sandbox/learnpianochords/dir-locals.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-let
-  briefcase = import <briefcase> {};
-in briefcase.utils.nixBufferFromShell ./shell.nix
diff --git a/website/sandbox/learnpianochords/shell.nix b/website/sandbox/learnpianochords/shell.nix
index 1a9c967f7fea..00bb4b0b3edc 100644
--- a/website/sandbox/learnpianochords/shell.nix
+++ b/website/sandbox/learnpianochords/shell.nix
@@ -2,9 +2,9 @@ let
   briefcase = import <briefcase> {};
   pkgs = briefcase.third_party.pkgs;
 in pkgs.mkShell {
-  buildInputs = with pkgs; [
-    elmPackages.elm
-    elmPackages.elm-format
-    elmPackages.elm-live
+  buildInputs = with pkgs.elmPackages; [
+    elm
+    elm-format
+    elm-live
   ];
 }
-- 
cgit 1.4.1