about summary refs log tree commit diff
path: root/users/wpcarro/assessments/brilliant
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2021-12-14T03·51-0800
committerclbot <clbot@tvl.fyi>2021-12-15T15·49+0000
commitb6d143e5d225e6aa293c23512336b7136ac58dcf (patch)
tree5cb070270342957f39415ab396a1d5f18a8a1fee /users/wpcarro/assessments/brilliant
parent38ec27e834b3d177b846d35064bba58fd70f41df (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/assessments/brilliant')
-rw-r--r--users/wpcarro/assessments/brilliant/default.nix6
-rw-r--r--users/wpcarro/assessments/brilliant/shell.nix10
2 files changed, 6 insertions, 10 deletions
diff --git a/users/wpcarro/assessments/brilliant/default.nix b/users/wpcarro/assessments/brilliant/default.nix
index 886ba87e1caf..536e54d3650a 100644
--- a/users/wpcarro/assessments/brilliant/default.nix
+++ b/users/wpcarro/assessments/brilliant/default.nix
@@ -1,6 +1,6 @@
-let
-  briefcase = import <briefcase> {};
-in briefcase.buildHaskell.program {
+{ depot, ... }:
+
+depot.users.wpcarro.buildHaskell.program {
   name = "transform-keyboard";
   srcs = builtins.path {
     path = ./.;
diff --git a/users/wpcarro/assessments/brilliant/shell.nix b/users/wpcarro/assessments/brilliant/shell.nix
index d0a6c7e5e6f5..e08399c093e1 100644
--- a/users/wpcarro/assessments/brilliant/shell.nix
+++ b/users/wpcarro/assessments/brilliant/shell.nix
@@ -1,10 +1,6 @@
-let
-  pkgs = import (builtins.fetchGit {
-    url = "https://github.com/NixOS/nixpkgs-channels";
-    ref = "nixos-20.03";
-    rev = "afa9ca61924f05aacfe495a7ad0fd84709d236cc";
-  }) {};
-in pkgs.mkShell {
+{ pkgs, ... }:
+
+pkgs.mkShell {
   buildInputs = with pkgs; [
     (haskellPackages.ghcWithPackages (hpkgs: with hpkgs; [
       hspec