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/website/sandbox/learnpianochords | |
| 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/website/sandbox/learnpianochords')
4 files changed, 13 insertions, 14 deletions
diff --git a/users/wpcarro/website/sandbox/learnpianochords/default.nix b/users/wpcarro/website/sandbox/learnpianochords/default.nix index 37dfd4d390f5..934fbd70ac17 100644 --- a/users/wpcarro/website/sandbox/learnpianochords/default.nix +++ b/users/wpcarro/website/sandbox/learnpianochords/default.nix @@ -1,4 +1,4 @@ -{ pkgs ? <nixpkgs>, ... }: +{ pkgs, ... }: with pkgs; @@ -16,9 +16,9 @@ let inherit name src; buildInputs = [ elmPackages.elm ] - ++ lib.optional outputJavaScript nodePackages_10_x.uglify-js; + ++ lib.optional outputJavaScript nodePackages.uglify-js; - buildPhase = pkgs.elmPackages.fetchElmDeps { + buildPhase = elmPackages.fetchElmDeps { elmPackages = import srcs; elmVersion = "0.19.1"; inherit registryDat; @@ -35,7 +35,7 @@ let ${lib.optionalString outputJavaScript '' echo "minifying ${elmfile module}" uglifyjs $out/${module}.${extension} --compress 'pure_funcs="F2,F3,F4,F5,F6,F7,F8,F9,A2,A3,A4,A5,A6,A7,A8,A9",pure_getters,keep_fargs=false,unsafe_comps,unsafe' \ - | uglifyjs --mangle --output=$out/${module}.min.${extension} + | uglifyjs --mangle --output $out/${module}.min.${extension} ''} '') targets)} ''; diff --git a/users/wpcarro/website/sandbox/learnpianochords/shell.nix b/users/wpcarro/website/sandbox/learnpianochords/shell.nix index 00bb4b0b3edc..afcc0f4d3645 100644 --- a/users/wpcarro/website/sandbox/learnpianochords/shell.nix +++ b/users/wpcarro/website/sandbox/learnpianochords/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/website/sandbox/learnpianochords/src/server/default.nix b/users/wpcarro/website/sandbox/learnpianochords/src/server/default.nix index 87de69cbd627..262693ae821e 100644 --- a/users/wpcarro/website/sandbox/learnpianochords/src/server/default.nix +++ b/users/wpcarro/website/sandbox/learnpianochords/src/server/default.nix @@ -1,6 +1,6 @@ -let - briefcase = import <briefcase> {}; -in briefcase.buildHaskell.program { +{ depot, ... }: + +depot.users.wpcarro.buildHaskell.program { name = "server"; srcs = builtins.path { path = ./.; diff --git a/users/wpcarro/website/sandbox/learnpianochords/src/server/shell.nix b/users/wpcarro/website/sandbox/learnpianochords/src/server/shell.nix index ab470841e6c1..6ec8264470db 100644 --- a/users/wpcarro/website/sandbox/learnpianochords/src/server/shell.nix +++ b/users/wpcarro/website/sandbox/learnpianochords/src/server/shell.nix @@ -1,6 +1,6 @@ -let - briefcase = import <briefcase> {}; -in briefcase.buildHaskell.shell { +{ depot, ... }: + +depot.users.wpcarro.buildHaskell.shell { deps = hpkgs: with hpkgs; [ hspec servant-server |