From 6b224a9e314b6faedd25fc5361a5bb6ac8c3e0a3 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Fri, 27 Mar 2020 10:47:41 +0000 Subject: Drop support for lorri Lorri does not cleanly integrate with my corporate device, which cannot run NixOS. To expose dependencies to Emacs buffers, I will use nix-buffer.el, which reads its values from dir-locals.nix. To easily expose dependencies from my existing shell.nix files into dir-locals.nix, I wrote a Nix utility function. --- scratch/deepmind/part_two/.envrc | 1 - scratch/deepmind/part_two/dir-locals.nix | 3 +++ scratch/deepmind/part_two/shell.nix | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) create 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 b80e28b4b815..1abb058f60d5 100644 --- a/scratch/deepmind/part_two/.envrc +++ b/scratch/deepmind/part_two/.envrc @@ -1,2 +1 @@ source_up -eval "$(lorri direnv)" diff --git a/scratch/deepmind/part_two/dir-locals.nix b/scratch/deepmind/part_two/dir-locals.nix new file mode 100644 index 000000000000..498f4b5055f8 --- /dev/null +++ b/scratch/deepmind/part_two/dir-locals.nix @@ -0,0 +1,3 @@ +let + briefcase = import {}; +in briefcase.utils.nixBufferFromShell ./shell.nix diff --git a/scratch/deepmind/part_two/shell.nix b/scratch/deepmind/part_two/shell.nix index 606dd7167f7c..65de884696d0 100644 --- a/scratch/deepmind/part_two/shell.nix +++ b/scratch/deepmind/part_two/shell.nix @@ -1,6 +1,6 @@ -{ pkgs ? import {}, ... }: - -pkgs.mkShell { +let + pkgs = import {}; +in pkgs.mkShell { buildInputs = with pkgs; [ nodejs python3 -- cgit 1.4.1