fix(wpcarro/nix): Remove <briefcase> references
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>
This commit is contained in:
parent
38ec27e834
commit
b6d143e5d2
53 changed files with 151 additions and 172 deletions
2
users/wpcarro/tools/monzo_ynab/.skip-subtree
Normal file
2
users/wpcarro/tools/monzo_ynab/.skip-subtree
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
Subdirectories of this folder should not be imported since they are
|
||||
internal to buildGo.nix and incompatible with readTree.
|
||||
|
|
@ -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
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
let
|
||||
briefcase = import <briefcase> {};
|
||||
pkgs = briefcase.third_party.pkgs;
|
||||
in pkgs.mkShell {
|
||||
{ pkgs, ... }:
|
||||
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
go
|
||||
goimports
|
||||
|
|
|
|||
|
|
@ -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}
|
||||
''
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
let
|
||||
briefcase = import <briefcase> {};
|
||||
in briefcase.buildHaskell.shell {
|
||||
{ depot, ... }:
|
||||
|
||||
depot.users.wpcarro.buildHaskell.shell {
|
||||
deps = hpkgs: with hpkgs; [
|
||||
time
|
||||
aeson
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue