mdebray/tvl-depot
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
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nix/nix-1p/default.nix
View file

@ -4,8 +4,9 @@
# This file configures TVL CI to mirror the subtree to GitHub. # This file configures TVL CI to mirror the subtree to GitHub.
{ depot ? { }, pkgs ? import <nixpkgs> { }, ... }: { depot ? { }, pkgs ? import <nixpkgs> { }, ... }:
(pkgs.runCommandLocal "nix-1p.md" { } '' (pkgs.runCommandLocal "nix-1p" { } ''
cp ${./README.md} $out mkdir $out
cp ${./README.md} $out/README.md
'').overrideAttrs (_: { '').overrideAttrs (_: {
meta.ci.extraSteps.github = depot.tools.releases.filteredGitPush { meta.ci.extraSteps.github = depot.tools.releases.filteredGitPush {
filter = ":/nix/nix-1p"; filter = ":/nix/nix-1p";

5
tools/nixery/default.nix
View file

@ -25,6 +25,9 @@ let
# through revision numbers. # through revision numbers.
nixery-commit-hash = "depot"; 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 in
depot.nix.readTree.drvTargets rec { depot.nix.readTree.drvTargets rec {
# Implementation of the Nix image building logic # 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. # If the nixpkgs commit is known, append it to the main docs page.
nixery-book = callPackage ./docs { nixery-book = callPackage ./docs {
nix-1p = depot.nix.nix-1p or nix-1p-git;
postamble = lib.optionalString (pkgs ? nixpkgsCommits.unstable) '' postamble = lib.optionalString (pkgs ? nixpkgsCommits.unstable) ''
### Which revision of `nixpkgs` is used for the builds? ### Which revision of `nixpkgs` is used for the builds?

10
tools/nixery/docs/default.nix
View file

@ -7,16 +7,8 @@
# Some of the documentation is pulled in and included from other # Some of the documentation is pulled in and included from other
# sources. # sources.
{ fetchFromGitHub, mdbook, runCommand, rustPlatform, postamble ? "" }: { fetchFromGitHub, mdbook, runCommand, rustPlatform, nix-1p, postamble ? "" }:
let
nix-1p = fetchFromGitHub {
owner = "tazjin";
repo = "nix-1p";
rev = "9f0baf5e270128d9101ba4446cf6844889e399a2";
sha256 = "1pf9i90gn98vz67h296w5lnwhssk62dc6pij983dff42dbci7lhj";
};
in
runCommand "nixery-book" runCommand "nixery-book"
{ {
POSTAMBLE = postamble; POSTAMBLE = postamble;