From 6f5211bba84bdaea391603e8aabbe304a79dd08b Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Wed, 1 Jul 2020 18:44:45 +0100 Subject: chore(ci-builds): Move third_party builds to their own package group ... and remove a package that doesn't exist anymore (at this location) from the nixpkgs allowlist. Change-Id: I663c84c387fb04bb3b47448132ad768ed5352474 Reviewed-on: https://cl.tvl.fyi/c/depot/+/829 Reviewed-by: BuildkiteCI Reviewed-by: isomer Tested-by: BuildkiteCI --- ci-builds.nix | 17 ++++++++--------- third_party/default.nix | 1 - 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ci-builds.nix b/ci-builds.nix index 1805972c9c..076c642584 100644 --- a/ci-builds.nix +++ b/ci-builds.nix @@ -51,14 +51,6 @@ in lib.fix (self: { wcl ]; - gitAndFriends = with depot; [ - third_party.cgit - third_party.git - web.cgit-taz - ]; - - nix = [ depot.third_party.nix ]; - ops = with depot.ops; [ depot.ops."posix_mq.rs" besadii @@ -67,13 +59,20 @@ in lib.fix (self: { mq_cli ]; + third_party = with depot.third_party; [ + cgit + git + nix + ]; + various = with depot; [ - depot.web.tvl lisp.dns nix.buildLisp.example nix.yants.tests tools.cheddar tools.nsfv-setup + web.cgit-taz + web.tvl (drvify "getBins-tests" nix.getBins.tests) ] ++ nix.runExecline.tests diff --git a/third_party/default.nix b/third_party/default.nix index 0a9217ee70..77f88b5a60 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -87,7 +87,6 @@ let lib libredirect luajit - luatex lutris makeFontsConf makeWrapper -- cgit 1.4.1