From f2443911cc730cbdd927a8c8b8e0012659a464ff Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 10 Apr 2021 13:38:50 +0200 Subject: refactor(fun): Consistent use of depot.third_party vs. pkgs 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 --- fun/paroxysm/default.nix | 7 ++----- fun/paroxysm/docker/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) (limited to 'fun/paroxysm') diff --git a/fun/paroxysm/default.nix b/fun/paroxysm/default.nix index dafd3cbb61..e4ce4df1ae 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 824259804a..cb5b2758ec 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" ]; -- cgit 1.4.1