maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(nixery): use nix-1p from within the depot

Browse source 
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 <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Autosubmit: tazjin <tazjin@tvl.su>
This commit is contained in:
Vincent Ambo 2022-06-16 17:59:48 +03:00 • committed by clbot
parent ac10907913
commit 544d72189c
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tools/nixery/default.nix
View file

@ -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?