From a34a82e3f5bedfaf15d0947b906b1da189136816 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Mon, 13 Jul 2026 21:20:04 -0400 Subject: [PATCH] Revert "Include homepage_private static files." This reverts commit f95fb5611a11c48016849f32ee7a0354a425e0c1. --- flake.nix | 6 ------ nix/package.nix | 11 +++++++++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index fe0df22..0972a45 100644 --- a/flake.nix +++ b/flake.nix @@ -84,18 +84,12 @@ 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 a147247..2578527 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,9 +1,9 @@ { + hello, lib, pkgs, natter, organic_ast_explorer, - homepage_private, }: let @@ -14,12 +14,19 @@ 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 '';