From 12e4cba3e6489045d63d2ff384a6c7e9f1541100 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Fri, 12 Jan 2024 00:41:15 +0100 Subject: [PATCH] websites: better watch scripts nix run .#\"\" will now actually listen for changes in the source repository, and not first copy the entire thing into the nix store. --- websites/docs.hacc.space/default.nix | 3 ++- websites/hacc.earth/default.nix | 3 ++- websites/help.studentsforfuture.info/default.nix | 3 ++- websites/infra4future.de/default.nix | 3 ++- websites/muc.hacc.earth/default.nix | 3 ++- websites/mumble.infra4future.de/default.nix | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/websites/docs.hacc.space/default.nix b/websites/docs.hacc.space/default.nix index 6ccca5d..e928834 100644 --- a/websites/docs.hacc.space/default.nix +++ b/websites/docs.hacc.space/default.nix @@ -22,6 +22,7 @@ stdenvNoCC.mkDerivation rec { ''; watch = writeScriptBin "watch" '' - ${zola}/bin/zola serve ${src} "$@" + cd $(git rev-parse --show-toplevel)/websites/docs.hacc.space + ${zola}/bin/zola serve --output-dir /tmp/hacc-docs "$@" ''; } diff --git a/websites/hacc.earth/default.nix b/websites/hacc.earth/default.nix index eb80f4e..4e897f3 100644 --- a/websites/hacc.earth/default.nix +++ b/websites/hacc.earth/default.nix @@ -14,6 +14,7 @@ stdenvNoCC.mkDerivation rec { ''; watch = writeScriptBin "watch" '' - ${sfz}/bin/sfz -r ${src} "$@" + cd $(git rev-parse --show-toplevel)/websites/hacc.earth + ${sfz}/bin/sfz "$@" ''; } diff --git a/websites/help.studentsforfuture.info/default.nix b/websites/help.studentsforfuture.info/default.nix index 069a6cb..f266319 100644 --- a/websites/help.studentsforfuture.info/default.nix +++ b/websites/help.studentsforfuture.info/default.nix @@ -14,6 +14,7 @@ stdenvNoCC.mkDerivation rec { ''; watch = writeScriptBin "watch" '' - ${sfz}/bin/sfz -r ${src} + cd $(git rev-parse --show-toplevel)/websites/help.studentsforfuture.info + ${sfz}/bin/sfz "$@" ''; } diff --git a/websites/infra4future.de/default.nix b/websites/infra4future.de/default.nix index 72d86f7..1365984 100644 --- a/websites/infra4future.de/default.nix +++ b/websites/infra4future.de/default.nix @@ -12,7 +12,8 @@ stdenvNoCC.mkDerivation rec { ''; watch = writeScriptBin "watch" '' + cd $(git rev-parse --show-toplevel)/websites/infra4future.de rm -rf /tmp/hacc-website - ${jekyll}/bin/jekyll serve -s ${src} --disable-disk-cache -d /tmp/hacc-website + ${jekyll}/bin/jekyll serve --disable-disk-cache -d /tmp/hacc-website "$@" ''; } diff --git a/websites/muc.hacc.earth/default.nix b/websites/muc.hacc.earth/default.nix index 069a6cb..34a9d75 100644 --- a/websites/muc.hacc.earth/default.nix +++ b/websites/muc.hacc.earth/default.nix @@ -14,6 +14,7 @@ stdenvNoCC.mkDerivation rec { ''; watch = writeScriptBin "watch" '' - ${sfz}/bin/sfz -r ${src} + cd $(git rev-parse --show-toplevel)/websites/muc.hacc.earth + ${sfz}/bin/sfz "$@" ''; } diff --git a/websites/mumble.infra4future.de/default.nix b/websites/mumble.infra4future.de/default.nix index 615f53b..2e0d509 100644 --- a/websites/mumble.infra4future.de/default.nix +++ b/websites/mumble.infra4future.de/default.nix @@ -12,7 +12,8 @@ stdenvNoCC.mkDerivation rec { ''; watch = writeScriptBin "watch" '' + cd $(git rev-parse --show-toplevel)/websites/mumble.infra4future.de rm -rf /tmp/hacc-website - ${jekyll}/bin/jekyll serve -s ${src} --disable-disk-cache -d /tmp/hacc-website + ${jekyll}/bin/jekyll serve --disable-disk-cache -d /tmp/hacc-website "$@" ''; }