From 544d72189c5c1dc7a24d5dec68e9d377a62e5dc0 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 16 Jun 2022 17:59:48 +0300 Subject: chore(nixery): use nix-1p from within the depot Since the source of nix-1p is checked in under //nix/nix-1p, we should use it from there if Nixery is being built inside of depot. Change-Id: Iddd54f7b93b398b2f909db6ee105366a9914a2ac Reviewed-on: https://cl.tvl.fyi/c/depot/+/5882 Reviewed-by: sterni Tested-by: BuildkiteCI Autosubmit: tazjin --- tools/nixery/default.nix | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tools/nixery/default.nix') diff --git a/tools/nixery/default.nix b/tools/nixery/default.nix index 1b1715cf9fcc..529794e5961f 100644 --- a/tools/nixery/default.nix +++ b/tools/nixery/default.nix @@ -25,6 +25,9 @@ let # through revision numbers. nixery-commit-hash = "depot"; + # If Nixery is built outside of depot, it needs to dynamically fetch + # the current nix-1p. + nix-1p-git = builtins.fetchGit "https://code.tvl.fyi/depot.git:/nix/nix-1p.git"; in depot.nix.readTree.drvTargets rec { # Implementation of the Nix image building logic @@ -36,6 +39,8 @@ depot.nix.readTree.drvTargets rec { # # If the nixpkgs commit is known, append it to the main docs page. nixery-book = callPackage ./docs { + nix-1p = depot.nix.nix-1p or nix-1p-git; + postamble = lib.optionalString (pkgs ? nixpkgsCommits.unstable) '' ### Which revision of `nixpkgs` is used for the builds? -- cgit 1.4.1