about summary refs log tree commit diff
path: root/boilerplate
diff options
context:
space:
mode:
Diffstat (limited to 'boilerplate')
-rw-r--r--boilerplate/clojure/.envrc2
-rw-r--r--boilerplate/clojure/dir-locals.nix3
-rw-r--r--boilerplate/clojure/shell.nix3
-rw-r--r--boilerplate/elm/.envrc2
-rw-r--r--boilerplate/elm/dir-locals.nix3
-rw-r--r--boilerplate/elm/shell.nix11
-rw-r--r--boilerplate/typescript/.envrc2
-rw-r--r--boilerplate/typescript/dir-locals.nix3
-rw-r--r--boilerplate/typescript/shell.nix3
9 files changed, 16 insertions, 16 deletions
diff --git a/boilerplate/clojure/.envrc b/boilerplate/clojure/.envrc
new file mode 100644
index 000000000000..a4a62da526d3
--- /dev/null
+++ b/boilerplate/clojure/.envrc
@@ -0,0 +1,2 @@
+source_up
+use_nix
diff --git a/boilerplate/clojure/dir-locals.nix b/boilerplate/clojure/dir-locals.nix
deleted file mode 100644
index 498f4b5055f8..000000000000
--- a/boilerplate/clojure/dir-locals.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-let
-  briefcase = import <briefcase> {};
-in briefcase.utils.nixBufferFromShell ./shell.nix
diff --git a/boilerplate/clojure/shell.nix b/boilerplate/clojure/shell.nix
index 0ea68aba4608..efa854422eae 100644
--- a/boilerplate/clojure/shell.nix
+++ b/boilerplate/clojure/shell.nix
@@ -1,5 +1,6 @@
 let
-  pkgs = import <nixpkgs> {};
+  briefcase = import <briefcase> {};
+  pkgs = briefcase.third_party.pkgs;
 in pkgs.mkShell {
   buildInputs = with pkgs; [
     leiningen
diff --git a/boilerplate/elm/.envrc b/boilerplate/elm/.envrc
new file mode 100644
index 000000000000..a4a62da526d3
--- /dev/null
+++ b/boilerplate/elm/.envrc
@@ -0,0 +1,2 @@
+source_up
+use_nix
diff --git a/boilerplate/elm/dir-locals.nix b/boilerplate/elm/dir-locals.nix
deleted file mode 100644
index 498f4b5055f8..000000000000
--- a/boilerplate/elm/dir-locals.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-let
-  briefcase = import <briefcase> {};
-in briefcase.utils.nixBufferFromShell ./shell.nix
diff --git a/boilerplate/elm/shell.nix b/boilerplate/elm/shell.nix
index 6f1c8ee23b30..00bb4b0b3edc 100644
--- a/boilerplate/elm/shell.nix
+++ b/boilerplate/elm/shell.nix
@@ -1,9 +1,10 @@
 let
-  pkgs = import <nixpkgs> {};
+  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
   ];
 }
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