Include homepage_private static files.
Some checks failed
build-staging Build build-staging has failed

This commit is contained in:
Tom Alexander
2026-07-13 21:05:07 -04:00
parent d523c7c7a4
commit 43462ba5ae
3 changed files with 9 additions and 10 deletions

View File

@@ -121,7 +121,7 @@ spec:
- name: url
value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git
- name: revision
value: 7d4b33528fef5f2e662d32d093566ce56eb4acd0
value: 740029f9557b586e1807586ebad58d6cd57ddae5
- name: pathInRepo
value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml
params:

View File

@@ -84,12 +84,18 @@
homepage = final.lib.makeScope final.newScope (
homepageScope:
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;
organic_ast_explorer' =
(organic_ast_explorer.overlays.default final final).organic_ast_explorer.release;
release = homepageScope.callPackage ./nix/package.nix {
natter = natter';
organic_ast_explorer = organic_ast_explorer';
inherit homepage_private;
};
nginx_conf = final.replaceVars "${./docker/server/nginx.conf}" {
web_root = release;

View File

@@ -1,9 +1,9 @@
{
hello,
lib,
pkgs,
natter,
organic_ast_explorer,
homepage_private,
}:
let
@@ -14,19 +14,12 @@ pkgs.stdenv.mkDerivation rec {
src = lib.cleanSource ../.;
nativeBuildInputs = [
# pkgs.simgrid
# pkgs.boost
# pkgs.cmake
];
configurePhase = "";
# TODO copy COPY --link --from=private /homepage_private/static /source/static/
buildPhase = ''
mkdir -p static/organic/ast_explorer
cp ${organic_ast_explorer}/* static/organic/ast_explorer/
cp -r ${homepage_private}/static/* static/
${natter}/bin/natter build --config natter.toml
'';