Switch to fetchGit.
Some checks failed
build-staging Build build-staging has failed

This commit is contained in:
Tom Alexander
2026-07-13 21:51:52 -04:00
parent a2b3bf3c69
commit c858893be3
2 changed files with 6 additions and 10 deletions

View File

@@ -2,9 +2,6 @@
# Builder # Builder
# #
FROM scratch AS private
ADD git@code.fizz.buzz:talexander/homepage_private.git /homepage_private
FROM nixos/nix:2.31.3 AS builder FROM nixos/nix:2.31.3 AS builder
RUN tee -a /etc/nix/nix.conf <<EOF RUN tee -a /etc/nix/nix.conf <<EOF
@@ -18,8 +15,7 @@ RUN cp "$(nix build nixpkgs#cacert --print-out-paths)/etc/ssl/certs/ca-bundle.cr
COPY . /tmp/build COPY . /tmp/build
WORKDIR /tmp/build WORKDIR /tmp/build
COPY --link --from=private /homepage_private /private RUN nix build --mount=type=ssh '.#docker_env'
RUN nix build --override-input homepage_private /private '.#docker_env'
# Export the built closure to a folder # Export the built closure to a folder
RUN mkdir /tmp/nix-store-closure RUN mkdir /tmp/nix-store-closure

View File

@@ -11,10 +11,6 @@
url = "git+https://code.fizz.buzz/talexander/organic_ast_explorer.git"; url = "git+https://code.fizz.buzz/talexander/organic_ast_explorer.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
homepage_private = {
url = "git+ssh://git@code.fizz.buzz/talexander/homepage_private.git";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
@@ -23,7 +19,6 @@
nixpkgs, nixpkgs,
natter, natter,
organic_ast_explorer, organic_ast_explorer,
homepage_private,
}: }:
let let
forAllSystems = forAllSystems =
@@ -89,6 +84,11 @@
homepage = final.lib.makeScope final.newScope ( homepage = final.lib.makeScope final.newScope (
homepageScope: homepageScope:
let let
homepage_private = fetchGit {
url = "git@code.fizz.buzz:talexander/homepage_private.git";
ref = "main";
rev = "89ba9628bf3e596345bc83f59cef5a2943584894";
};
natter' = (natter.overlays.default final final).natter.release; natter' = (natter.overlays.default final final).natter.release;
organic_ast_explorer' = organic_ast_explorer' =
(organic_ast_explorer.overlays.default final final).organic_ast_explorer.release; (organic_ast_explorer.overlays.default final final).organic_ast_explorer.release;