diff options
| author | Vincent Ambo <mail@tazj.in> | 2021-04-10T11·38+0200 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2021-04-10T12·04+0000 |
| commit | f2443911cc730cbdd927a8c8b8e0012659a464ff (patch) | |
| tree | ca38f672a760ed806353c2b5b2af88f2b14159fc /fun/paroxysm | |
| parent | 8361b82d0ac59f436f7ecef283077b0f7d689ca1 (diff) | |
refactor(fun): Consistent use of depot.third_party vs. pkgs r/2462
In preparation for the solution of b/108, we need to consistently use `depot.third_party` for packages that are only packed in the TVL depot and `pkgs` for things that come from nixpkgs. This commit cleans up a huge chunk of these uses in //fun Change-Id: I45a7b392a9749fa7859ff5100dcea415bda807c3 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2914 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'fun/paroxysm')
| -rw-r--r-- | fun/paroxysm/default.nix | 7 | ||||
| -rw-r--r-- | fun/paroxysm/docker/default.nix | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/fun/paroxysm/default.nix b/fun/paroxysm/default.nix index dafd3cbb616b..e4ce4df1ae38 100644 --- a/fun/paroxysm/default.nix +++ b/fun/paroxysm/default.nix @@ -1,9 +1,6 @@ -{ depot, ... }: +{ depot, pkgs, ... }: -let - pkgs = depot.third_party; -in -pkgs.naersk.buildPackage { +depot.third_party.naersk.buildPackage { name = "paroxysm"; version = "0.0.2"; src = ./.; diff --git a/fun/paroxysm/docker/default.nix b/fun/paroxysm/docker/default.nix index 824259804a1c..cb5b2758ec63 100644 --- a/fun/paroxysm/docker/default.nix +++ b/fun/paroxysm/docker/default.nix @@ -1,6 +1,6 @@ -{ depot, ... }: +{ depot, pkgs, ... }: -depot.third_party.dockerTools.buildLayeredImage { +pkgs.dockerTools.buildLayeredImage { name = "paroxysm"; contents = [ depot.fun.paroxysm ]; config.Entrypoint = [ "${depot.fun.paroxysm}/bin/paroxysm" ]; |