mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(fun): Consistent use of depot.third_party vs. pkgs

Browse source 
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>
This commit is contained in:
Vincent Ambo 2021-04-10 13:38:50 +02:00 committed by tazjin
parent 8361b82d0a
commit f2443911cc
6 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fun/gemma/default.nix
View file

@ -2,7 +2,7 @@
let let
inherit (pkgs) cacert iana-etc libredirect stdenv runCommandNoCC writeText; inherit (pkgs) cacert iana-etc libredirect stdenv runCommandNoCC writeText;
elmPackages = pkgs.elmPackages_0_18; elmPackages = depot.third_party.elmPackages_0_18;
frontend = stdenv.mkDerivation { frontend = stdenv.mkDerivation {
name = "gemma-frontend.html"; name = "gemma-frontend.html";
@ -36,7 +36,7 @@ let
in depot.nix.buildLisp.program { in depot.nix.buildLisp.program {
name = "gemma"; name = "gemma";
deps = with pkgs.lisp; [ deps = with depot.third_party.lisp; [
cl-json cl-json
cl-prevalence cl-prevalence
hunchentoot hunchentoot

7
fun/paroxysm/default.nix
View file

@ -1,9 +1,6 @@
{ depot, ... }: { depot, pkgs, ... }:
let depot.third_party.naersk.buildPackage {
pkgs = depot.third_party;
in
pkgs.naersk.buildPackage {
name = "paroxysm"; name = "paroxysm";
version = "0.0.2"; version = "0.0.2";
src = ./.; src = ./.;

4
fun/paroxysm/docker/default.nix
View file

@ -1,6 +1,6 @@
{ depot, ... }: { depot, pkgs, ... }:
depot.third_party.dockerTools.buildLayeredImage { pkgs.dockerTools.buildLayeredImage {
name = "paroxysm"; name = "paroxysm";
contents = [ depot.fun.paroxysm ]; contents = [ depot.fun.paroxysm ];
config.Entrypoint = [ "${depot.fun.paroxysm}/bin/paroxysm" ]; config.Entrypoint = [ "${depot.fun.paroxysm}/bin/paroxysm" ];

6
fun/streamTVL/default.nix
View file

@ -1,7 +1,7 @@
{ depot, ... }: { pkgs, ... }:
depot.third_party.writeShellScriptBin "start-tvl-stream" '' pkgs.writeShellScriptBin "start-tvl-stream" ''
env LD_LIBRARY_PATH=/run/opengl-driver/lib/ ${depot.third_party.ffmpeg}/bin/ffmpeg \ env LD_LIBRARY_PATH=/run/opengl-driver/lib/ ${pkgs.ffmpeg-full}/bin/ffmpeg \
-vsync 0 \ -vsync 0 \
-hwaccel cuvid \ -hwaccel cuvid \
-init_hw_device cuda=0 -filter_hw_device 0 \ -init_hw_device cuda=0 -filter_hw_device 0 \

5
fun/uggc/default.nix
View file

@ -1,7 +1,8 @@
{ depot, pkgs, ... }@args: { depot, pkgs, ... }:
let let
inherit (pkgs) gopkgs; inherit (depot.third_party) gopkgs;
uggc = depot.nix.buildGo.program { uggc = depot.nix.buildGo.program {
name = "uggc"; name = "uggc";
srcs = [ srcs = [

1
third_party/nixpkgs-exposed/exposed/default.nix vendored
View file

@ -55,6 +55,7 @@
fetchgit fetchgit
fetchurl fetchurl
fetchzip fetchzip
ffmpeg-full
findutils findutils
fira fira
fira-code fira-code