diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-04-21T12·14+0200 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-12-26T15·43+0000 |
| commit | 53d59ab1f62c56e8381eed5eb612c125c64b0bc9 (patch) | |
| tree | c2b2426b20d298a66347ed0da8bcc3e63728965d | |
| parent | 54642c822d2ba0093aec4ac619fe6f84ca3ffeec (diff) | |
feat(3p/overlays): Build overlaid packages in CI explicitly r/5498
Change-Id: I2f9e4f6f5f0193456f773e62ce5b8163b253de0c Reviewed-on: https://cl.tvl.fyi/c/depot/+/5489 Autosubmit: tazjin <tazjin@tvl.su> Reviewed-by: sterni <sternenseemann@systemli.org> Tested-by: BuildkiteCI
| -rw-r--r-- | default.nix | 3 | ||||
| -rw-r--r-- | third_party/overlays/tvl.nix | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/default.nix b/default.nix index 640f6fda959a..2ac136404dfb 100644 --- a/default.nix +++ b/default.nix @@ -112,9 +112,6 @@ readTree.fix (self: (readDepot { # 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; }; }); # Derivation that gcroots all depot targets. diff --git a/third_party/overlays/tvl.nix b/third_party/overlays/tvl.nix index 7dd9445eb0b3..bb41ec129e53 100644 --- a/third_party/overlays/tvl.nix +++ b/third_party/overlays/tvl.nix @@ -32,7 +32,7 @@ let } ).tarball; in -{ +depot.nix.readTree.drvTargets { nix_2_3 = super.nix_2_3.overrideAttrs (_: { src = "${nixTarball}/tarballs/nix-${nixTarball.version}.tar.xz"; }); |