From a81d06308970db09efb435741ab776a6f8d16c84 Mon Sep 17 00:00:00 2001 From: matt1432 <matt@nelim.org> Date: Fri, 14 Mar 2025 21:31:25 -0400 Subject: [PATCH] fix(homepage): bump to 1.0.1 and make it run properly --- .../nos/modules/homepage/default.nix | 2 ++ packages/homepage/default.nix | 26 +++++++------------ 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/configurations/nos/modules/homepage/default.nix b/configurations/nos/modules/homepage/default.nix index 2b4cfb67..63fdec36 100644 --- a/configurations/nos/modules/homepage/default.nix +++ b/configurations/nos/modules/homepage/default.nix @@ -3,6 +3,8 @@ pkgs, ... }: { + systemd.services.homepage-dashboard.environment.HOMEPAGE_ALLOWED_HOSTS = "lan.nelim.org"; + services.homepage-dashboard = { enable = true; diff --git a/packages/homepage/default.nix b/packages/homepage/default.nix index ced7e056..ce419fd7 100644 --- a/packages/homepage/default.nix +++ b/packages/homepage/default.nix @@ -8,25 +8,23 @@ fetchFromGitHub, makeWrapper, # deps - git, nodejs, pnpm, - python3, ... }: let - inherit (lib) optionalString; + inherit (lib) getExe optionalString; installLocalIcons = import ./icons.nix {inherit fetchFromGitHub;}; in stdenv.mkDerivation (finalAttrs: { pname = "homepage-dashboard"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${finalAttrs.version}"; - hash = "sha256-j543lwSWOFuPjHCTN/4vEKME39RpG4D16qWeSrL5hZY="; + hash = "sha256-cnVnNA0+UYYLyo7HgNvkWoSAJhr0T51MGItd/JIencE="; }; pnpmDepsHash = "sha256-E16+JLtfoiWCXwgFGdTGuFlx/pYxhINNl6tCuF9Z6MQ="; @@ -36,24 +34,18 @@ in hash = finalAttrs.pnpmDepsHash; }; - buildPhase = '' - pnpm build - ''; - - postBuild = '' - # Add a shebang to the server js file, then patch the shebang. - sed -i '1s|^|#!/usr/bin/env node\n|' .next/standalone/server.js - patchShebangs .next/standalone/server.js - ''; - nativeBuildInputs = [ - git makeWrapper nodejs pnpm.configHook ]; - env.PYTHON = "${python3}/bin/python"; + buildPhase = '' + pnpm build + + # Add a shebang to the server js file + sed -i '1s|^|#!${getExe nodejs}\n|' .next/standalone/server.js + ''; installPhase = '' runHook preInstall