From 944b0a5624b2c4764ad576d85f811d4956405bec Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Mon, 13 Jul 2026 21:05:07 -0400 Subject: [PATCH] Include homepage_private static files. --- .webhook_bridge/pipeline-build-homepage-staging.yaml | 2 +- flake.nix | 6 ++++++ nix/package.nix | 11 ++--------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.webhook_bridge/pipeline-build-homepage-staging.yaml b/.webhook_bridge/pipeline-build-homepage-staging.yaml index 657f2e1..a7c8351 100644 --- a/.webhook_bridge/pipeline-build-homepage-staging.yaml +++ b/.webhook_bridge/pipeline-build-homepage-staging.yaml @@ -121,7 +121,7 @@ spec: - name: url value: https://code.fizz.buzz/talexander/personal_tekton_catalog.git - name: revision - value: 7d4b33528fef5f2e662d32d093566ce56eb4acd0 + value: c729da3ffbbda11dd931ad560d4c4962601b7c5d - name: pathInRepo value: task/buildkit-rootless-daemonless/0.1/buildkit-rootless-daemonless.yaml params: diff --git a/flake.nix b/flake.nix index 0972a45..fe0df22 100644 --- a/flake.nix +++ b/flake.nix @@ -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; diff --git a/nix/package.nix b/nix/package.nix index 2578527..a147247 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -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 '';