diff options
| author | William Carroll <wpcarro@gmail.com> | 2021-12-14T03·51-0800 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2021-12-15T15·49+0000 |
| commit | b6d143e5d225e6aa293c23512336b7136ac58dcf (patch) | |
| tree | 5cb070270342957f39415ab396a1d5f18a8a1fee /users/wpcarro/boilerplate | |
| parent | 38ec27e834b3d177b846d35064bba58fd70f41df (diff) | |
fix(wpcarro/nix): Remove <briefcase> references r/3249
Angle-bracketed references are a Nix anti-pattern, and thankfully this repository enforces this as a standard. TL;DR: - Drop angle-bracketed references - Change `briefcase` -> `users.wpcarro` - Fix any resulting regressions - Fix //users/wpcarro/tools/simple_vim - Mark //users/wpcarro/boilerplate/typescript and related projects as broken - drop .skip-subtree file, enabling depot CI Change-Id: I7153cbabafa617bfd6b199370cbec65cb75441f6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/4325 Tested-by: BuildkiteCI Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: grfn <grfn@gws.fyi> Autosubmit: wpcarro <wpcarro@gmail.com>
Diffstat (limited to 'users/wpcarro/boilerplate')
| -rw-r--r-- | users/wpcarro/boilerplate/clojure/shell.nix | 7 | ||||
| -rw-r--r-- | users/wpcarro/boilerplate/elm/shell.nix | 7 | ||||
| -rw-r--r-- | users/wpcarro/boilerplate/typescript/default.nix | 4 | ||||
| -rw-r--r-- | users/wpcarro/boilerplate/typescript/shell.nix | 7 |
4 files changed, 13 insertions, 12 deletions
diff --git a/users/wpcarro/boilerplate/clojure/shell.nix b/users/wpcarro/boilerplate/clojure/shell.nix index efa854422eae..8b92b592e1ac 100644 --- a/users/wpcarro/boilerplate/clojure/shell.nix +++ b/users/wpcarro/boilerplate/clojure/shell.nix @@ -1,7 +1,6 @@ -let - briefcase = import <briefcase> {}; - pkgs = briefcase.third_party.pkgs; -in pkgs.mkShell { +{ pkgs, ... }: + +pkgs.mkShell { buildInputs = with pkgs; [ leiningen ]; diff --git a/users/wpcarro/boilerplate/elm/shell.nix b/users/wpcarro/boilerplate/elm/shell.nix index 00bb4b0b3edc..afcc0f4d3645 100644 --- a/users/wpcarro/boilerplate/elm/shell.nix +++ b/users/wpcarro/boilerplate/elm/shell.nix @@ -1,7 +1,6 @@ -let - briefcase = import <briefcase> {}; - pkgs = briefcase.third_party.pkgs; -in pkgs.mkShell { +{ pkgs, ... }: + +pkgs.mkShell { buildInputs = with pkgs.elmPackages; [ elm elm-format diff --git a/users/wpcarro/boilerplate/typescript/default.nix b/users/wpcarro/boilerplate/typescript/default.nix index 14a39dee1785..d27162d345a7 100644 --- a/users/wpcarro/boilerplate/typescript/default.nix +++ b/users/wpcarro/boilerplate/typescript/default.nix @@ -11,9 +11,13 @@ pkgs.stdenv.mkDerivation { # parcel.js needs number of CPUs PARCEL_WORKERS = "1"; buildPhase = '' + export HOME="." npx parcel build src/index.html --public-url ./ ''; installPhase = '' mv dist $out ''; + + # TODO(wpcarro): This doesn't build at all. + meta.ci = false; } diff --git a/users/wpcarro/boilerplate/typescript/shell.nix b/users/wpcarro/boilerplate/typescript/shell.nix index 083254beefd0..a3ae929ef446 100644 --- a/users/wpcarro/boilerplate/typescript/shell.nix +++ b/users/wpcarro/boilerplate/typescript/shell.nix @@ -1,7 +1,6 @@ -let - briefcase = import <briefcase> {}; - pkgs = briefcase.third_party.pkgs; -in pkgs.mkShell { +{ pkgs, ... }: + +pkgs.mkShell { buildInputs = with pkgs; [ nodejs yarn |