diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-06-16T14·59+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-06-16T15·08+0000 |
| commit | 544d72189c5c1dc7a24d5dec68e9d377a62e5dc0 (patch) | |
| tree | 1903b9170b5abc631ee916d8cdad9177a8b6baec /tools | |
| parent | ac10907913b713403194021c1d68cb34a1d68a19 (diff) | |
chore(nixery): use nix-1p from within the depot r/4242
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/nixery/default.nix | 5 | ||||
| -rw-r--r-- | tools/nixery/docs/default.nix | 10 |
2 files changed, 6 insertions, 9 deletions
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? diff --git a/tools/nixery/docs/default.nix b/tools/nixery/docs/default.nix index 74409fcfa92f..f26b24f2c146 100644 --- a/tools/nixery/docs/default.nix +++ b/tools/nixery/docs/default.nix @@ -7,16 +7,8 @@ # Some of the documentation is pulled in and included from other # 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" { POSTAMBLE = postamble; |