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 --- boilerplate/typescript/.envrc | 2 ++ boilerplate/typescript/dir-locals.nix | 3 --- boilerplate/typescript/shell.nix | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 boilerplate/typescript/.envrc delete mode 100644 boilerplate/typescript/dir-locals.nix (limited to 'boilerplate/typescript') diff --git a/boilerplate/typescript/.envrc b/boilerplate/typescript/.envrc new file mode 100644 index 000000000000..a4a62da526d3 --- /dev/null +++ b/boilerplate/typescript/.envrc @@ -0,0 +1,2 @@ +source_up +use_nix diff --git a/boilerplate/typescript/dir-locals.nix b/boilerplate/typescript/dir-locals.nix deleted file mode 100644 index 498f4b5055f8..000000000000 --- a/boilerplate/typescript/dir-locals.nix +++ /dev/null @@ -1,3 +0,0 @@ -let - briefcase = import <briefcase> {}; -in briefcase.utils.nixBufferFromShell ./shell.nix diff --git a/boilerplate/typescript/shell.nix b/boilerplate/typescript/shell.nix index ec2a1ce833fa..083254beefd0 100644 --- a/boilerplate/typescript/shell.nix +++ b/boilerplate/typescript/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