From 473604f5675c455a65b91e287b125a9e042ae39f Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sat, 10 Apr 2021 18:05:16 +0200 Subject: refactor: Move nixpkgs attribute to `third_party.nixpkgs` Please read b/108 to make sense of this. This gets rid of the explicit list of exposed packages from nixpkgs, and instead makes the entire package set available at `third_party.nixpkgs`. To accommodate this, a LOT of things have to be very slightly shuffled around. Some of this was done in already submitted CLs, but this change is unfortunately still quite noisy. Pay extra attention to: * overlay-like functionality that was partially moved to actual overlays (partially as in, the minimum required to get a green build) * modified uses of the package set path, esp. in NixOS systems Special notes: * xanthous has been disabled in CI because of issues with the Haskell overlay * //third_party/nix has been disabled because of other unclear dependency issues Both of these will be tackled in a followup CL. Change-Id: I2f9c60a4d275fdb5209264be0addfd7e06c53118 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2910 Reviewed-by: glittershark Reviewed-by: sterni Tested-by: BuildkiteCI --- default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index 15224b9cab..ee22077574 100644 --- a/default.nix +++ b/default.nix @@ -19,11 +19,11 @@ let inherit depot; # Expose lib attribute to packages. - inherit (depot) lib; + inherit (depot.third_party.nixpkgs) lib; # Pass third_party as 'pkgs' (for compatibility with external # imports for certain subdirectories) - pkgs = depot.third_party; + pkgs = depot.third_party.nixpkgs; }; readTree' = import ./nix/readTree {}; @@ -75,9 +75,6 @@ in fix(self: { __readTree = []; config = config self; - # Elevate 'lib' from nixpkgs - lib = import (self.third_party.nixpkgsSrc + "/lib"); - # Expose readTree for downstream repo consumers. readTree = { __functor = x: (readTree' x.config); @@ -97,6 +94,9 @@ in fix(self: { # generate pipelines because that also leads to infinite # recursion. ops = self.ops // { pipelines = null; }; + + # remove nixpkgs from the set, for obvious reasons. + third_party = self.third_party // { nixpkgs = null; }; }); } -- cgit 1.4.1