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/assessments | |
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/assessments')
-rw-r--r-- | users/wpcarro/assessments/brilliant/default.nix | 6 | ||||
-rw-r--r-- | users/wpcarro/assessments/brilliant/shell.nix | 10 | ||||
-rw-r--r-- | users/wpcarro/assessments/dotted-squares/shell.nix | 6 | ||||
-rw-r--r-- | users/wpcarro/assessments/semiprimes/default.nix | 1 | ||||
-rw-r--r-- | users/wpcarro/assessments/tt/client/dir-locals.nix | 3 | ||||
-rw-r--r-- | users/wpcarro/assessments/tt/client/shell.nix | 6 | ||||
-rw-r--r-- | users/wpcarro/assessments/tt/shell.nix | 3 |
7 files changed, 14 insertions, 21 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 diff --git a/users/wpcarro/assessments/dotted-squares/shell.nix b/users/wpcarro/assessments/dotted-squares/shell.nix index 87eb23d731e2..868668ca501c 100644 --- a/users/wpcarro/assessments/dotted-squares/shell.nix +++ b/users/wpcarro/assessments/dotted-squares/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 unordered-containers diff --git a/users/wpcarro/assessments/semiprimes/default.nix b/users/wpcarro/assessments/semiprimes/default.nix deleted file mode 100644 index 29452eac250c..000000000000 --- a/users/wpcarro/assessments/semiprimes/default.nix +++ /dev/null @@ -1 +0,0 @@ -# stubbed diff --git a/users/wpcarro/assessments/tt/client/dir-locals.nix b/users/wpcarro/assessments/tt/client/dir-locals.nix deleted file mode 100644 index 5c3ae08870b0..000000000000 --- a/users/wpcarro/assessments/tt/client/dir-locals.nix +++ /dev/null @@ -1,3 +0,0 @@ -let - briefcase = import /home/wpcarro/briefcase {}; -in briefcase.utils.nixBufferFromShell ./shell.nix diff --git a/users/wpcarro/assessments/tt/client/shell.nix b/users/wpcarro/assessments/tt/client/shell.nix index 15ac040b9462..78f55385db9a 100644 --- a/users/wpcarro/assessments/tt/client/shell.nix +++ b/users/wpcarro/assessments/tt/client/shell.nix @@ -1,6 +1,6 @@ -let - pkgs = import <nixpkgs> {}; -in pkgs.mkShell { +{ pkgs, ... }: + +pkgs.mkShell { buildInputs = with pkgs; [ nodejs elmPackages.elm diff --git a/users/wpcarro/assessments/tt/shell.nix b/users/wpcarro/assessments/tt/shell.nix index 567b71060b7b..88761e539920 100644 --- a/users/wpcarro/assessments/tt/shell.nix +++ b/users/wpcarro/assessments/tt/shell.nix @@ -1,5 +1,6 @@ +{ pkgs, depot, ... }: + let - pkgs = import <nixpkgs> {}; hailgun-src = builtins.fetchGit { url = "https://bitbucket.org/echo_rm/hailgun.git"; rev = "9d5da7c902b2399e0fcf3d494ee04cf2bbfe7c9e"; |