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/tools | |
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/tools')
-rw-r--r-- | users/wpcarro/tools/monzo_ynab/.skip-subtree | 2 | ||||
-rw-r--r-- | users/wpcarro/tools/monzo_ynab/job.nix | 8 | ||||
-rw-r--r-- | users/wpcarro/tools/monzo_ynab/main.go | 5 | ||||
-rw-r--r-- | users/wpcarro/tools/monzo_ynab/shell.nix | 15 | ||||
-rw-r--r-- | users/wpcarro/tools/monzo_ynab/tokens.nix | 12 | ||||
-rw-r--r-- | users/wpcarro/tools/rfcToKindle/default.nix | 2 | ||||
-rw-r--r-- | users/wpcarro/tools/run/default.nix | 6 | ||||
-rw-r--r-- | users/wpcarro/tools/run/shell.nix | 7 | ||||
-rw-r--r-- | users/wpcarro/tools/simple_vim/default.nix | 10 | ||||
-rw-r--r-- | users/wpcarro/tools/symlinkManager/default.nix | 8 | ||||
-rw-r--r-- | users/wpcarro/tools/url-blocker/shell.nix | 6 |
11 files changed, 42 insertions, 39 deletions
diff --git a/users/wpcarro/tools/monzo_ynab/.skip-subtree b/users/wpcarro/tools/monzo_ynab/.skip-subtree new file mode 100644 index 000000000000..8db1f814f653 --- /dev/null +++ b/users/wpcarro/tools/monzo_ynab/.skip-subtree @@ -0,0 +1,2 @@ +Subdirectories of this folder should not be imported since they are +internal to buildGo.nix and incompatible with readTree. diff --git a/users/wpcarro/tools/monzo_ynab/job.nix b/users/wpcarro/tools/monzo_ynab/job.nix index 1e10751012e2..c2c8baab3b45 100644 --- a/users/wpcarro/tools/monzo_ynab/job.nix +++ b/users/wpcarro/tools/monzo_ynab/job.nix @@ -1,11 +1,13 @@ -{ depot, briefcase, ... }: +{ depot, ... }: -depot.buildGo.program { +let + inherit (depot.users.wpcarro) gopkgs; +in depot.nix.buildGo.program { name = "job"; srcs = [ ./main.go ]; - deps = with briefcase.gopkgs; [ + deps = with gopkgs; [ kv utils ]; diff --git a/users/wpcarro/tools/monzo_ynab/main.go b/users/wpcarro/tools/monzo_ynab/main.go index 06f1944eab70..f40c70ce27d1 100644 --- a/users/wpcarro/tools/monzo_ynab/main.go +++ b/users/wpcarro/tools/monzo_ynab/main.go @@ -10,7 +10,8 @@ package main import ( - "fmt" + "os" + "monzoSerde" ) var ( @@ -34,7 +35,7 @@ func toYnab(tx monzoSerde.Transaction) ynabSerde.Transaction { func main() { txs := monzo.TransactionsLast24Hours() - var ynabTxs []ynabSerde.Transaction{} + var ynabTxs []ynabSerde.Transaction for tx := range txs { append(ynabTxs, toYnab(tx)) } diff --git a/users/wpcarro/tools/monzo_ynab/shell.nix b/users/wpcarro/tools/monzo_ynab/shell.nix index 910d7c1829e2..f777c13fefae 100644 --- a/users/wpcarro/tools/monzo_ynab/shell.nix +++ b/users/wpcarro/tools/monzo_ynab/shell.nix @@ -1,10 +1,9 @@ -let - briefcase = import <briefcase> {}; - pkgs = briefcase.third_party.pkgs; -in pkgs.mkShell { - buildInputs = [ - pkgs.go - pkgs.goimports - pkgs.godef +{ pkgs, ... }: + +pkgs.mkShell { + buildInputs = with pkgs; [ + go + goimports + godef ]; } diff --git a/users/wpcarro/tools/monzo_ynab/tokens.nix b/users/wpcarro/tools/monzo_ynab/tokens.nix index 97de09d741e9..b58c272bde02 100644 --- a/users/wpcarro/tools/monzo_ynab/tokens.nix +++ b/users/wpcarro/tools/monzo_ynab/tokens.nix @@ -1,21 +1,23 @@ -{ depot, briefcase, ... }: +{ depot, ... }: let - auth = depot.buildGo.package { + inherit (depot.users.wpcarro) gopkgs; + + auth = depot.nix.buildGo.package { name = "auth"; srcs = [ ./auth.go ]; - deps = with briefcase.gopkgs; [ + deps = with gopkgs; [ utils ]; }; -in depot.buildGo.program { +in depot.nix.buildGo.program { name = "token-server"; srcs = [ ./tokens.go ]; - deps = with briefcase.gopkgs; [ + deps = with gopkgs; [ kv utils auth diff --git a/users/wpcarro/tools/rfcToKindle/default.nix b/users/wpcarro/tools/rfcToKindle/default.nix index 8fb93c3bb5b8..4ea271943950 100644 --- a/users/wpcarro/tools/rfcToKindle/default.nix +++ b/users/wpcarro/tools/rfcToKindle/default.nix @@ -2,7 +2,7 @@ # TODO: This doesn't depend on `sendgmr` at the moment, but it should. As such, # it's an imcomplete packaging. -depot.buildGo.program { +depot.nix.buildGo.program { name = "rfcToKindle"; srcs = [ ./main.go diff --git a/users/wpcarro/tools/run/default.nix b/users/wpcarro/tools/run/default.nix index 7d772c3f9079..807a75c28450 100644 --- a/users/wpcarro/tools/run/default.nix +++ b/users/wpcarro/tools/run/default.nix @@ -1,11 +1,11 @@ -{ pkgs, depot, briefcase, ... }: +{ pkgs, depot, ... }: -depot.buildGo.program { +depot.nix.buildGo.program { name = "run"; srcs = [ ./main.go ]; - deps = with briefcase.gopkgs; [ + deps = with depot.users.wpcarro.gopkgs; [ utils ]; } diff --git a/users/wpcarro/tools/run/shell.nix b/users/wpcarro/tools/run/shell.nix index e14bffae487c..f777c13fefae 100644 --- a/users/wpcarro/tools/run/shell.nix +++ b/users/wpcarro/tools/run/shell.nix @@ -1,7 +1,6 @@ -let - briefcase = import <briefcase> {}; - pkgs = briefcase.third_party.pkgs; -in pkgs.mkShell { +{ pkgs, ... }: + +pkgs.mkShell { buildInputs = with pkgs; [ go goimports diff --git a/users/wpcarro/tools/simple_vim/default.nix b/users/wpcarro/tools/simple_vim/default.nix index f8f965f2c024..6631fdfff5da 100644 --- a/users/wpcarro/tools/simple_vim/default.nix +++ b/users/wpcarro/tools/simple_vim/default.nix @@ -6,10 +6,6 @@ let name = "config.vim"; }; - script = pkgs.writeShellScriptBin "simple_vim" '' - ${pkgs.vim}/bin/vim -u ${configVim} - ''; -in pkgs.stdenv.mkDerivation { - name = "simple_vim"; - buildInputs = [ script ]; -} +in pkgs.writeShellScriptBin "simple_vim" '' + ${pkgs.vim}/bin/vim -u ${configVim} +'' diff --git a/users/wpcarro/tools/symlinkManager/default.nix b/users/wpcarro/tools/symlinkManager/default.nix index 16bb26bb3c2e..4e261d730932 100644 --- a/users/wpcarro/tools/symlinkManager/default.nix +++ b/users/wpcarro/tools/symlinkManager/default.nix @@ -1,11 +1,13 @@ -{ depot, briefcase, ... }: +{ depot, ... }: -depot.buildGo.program { +let + inherit (depot.users.wpcarro) gopkgs; +in depot.nix.buildGo.program { name = "symlink-mgr"; srcs = [ ./main.go ]; - deps = with briefcase.gopkgs; [ + deps = with gopkgs; [ utils ]; } diff --git a/users/wpcarro/tools/url-blocker/shell.nix b/users/wpcarro/tools/url-blocker/shell.nix index 1adc566c0121..aa5c906edc90 100644 --- a/users/wpcarro/tools/url-blocker/shell.nix +++ b/users/wpcarro/tools/url-blocker/shell.nix @@ -1,6 +1,6 @@ -let - briefcase = import <briefcase> {}; -in briefcase.buildHaskell.shell { +{ depot, ... }: + +depot.users.wpcarro.buildHaskell.shell { deps = hpkgs: with hpkgs; [ time aeson |