From 546aeb599dfe72699b4c340a57eaa35abf933e25 Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Sun, 9 Mar 2025 17:24:09 +0100 Subject: [PATCH 1/2] Allow 'initdb' to fail in Bookwyrm systemd unit --- packages/bookwyrm/nixos-module.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/bookwyrm/nixos-module.nix b/packages/bookwyrm/nixos-module.nix index 36cbc3f..4b97889 100644 --- a/packages/bookwyrm/nixos-module.nix +++ b/packages/bookwyrm/nixos-module.nix @@ -14,9 +14,10 @@ with pkgs . kernelmaft ; [Service] + # 'initdb' fails harmlessly if it has been run on the database before ExecStartPre=${coreutils-full}/bin/ln -sf ${bookwyrm}/var/lib/bookwyrm/VERSION /var/lib/bookwyrm/ ExecStartPre=${bookwyrm}/bin/bookwyrm-env ${python311}/bin/python ${bookwyrm}/lib/python3.11/manage.py migrate - ExecStartPre=${bookwyrm}/bin/bookwyrm-env ${python311}/bin/python ${bookwyrm}/lib/python3.11/manage.py initdb + ExecStartPre=-${bookwyrm}/bin/bookwyrm-env ${python311}/bin/python ${bookwyrm}/lib/python3.11/manage.py initdb ExecStart=${bookwyrm}/bin/bookwyrm-env ${bookwyrm}/bin/bookwyrm WorkingDirectory=/var/lib/bookwyrm From d0d130d3b187a62a15a2a0e9bff2c5703b3b9fbe Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Sun, 9 Mar 2025 17:24:25 +0100 Subject: [PATCH 2/2] Add temporary debug commands to Bookwyrm package build script --- packages/bookwyrm/package.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/bookwyrm/package.nix b/packages/bookwyrm/package.nix index 0fb96b8..ad522e0 100644 --- a/packages/bookwyrm/package.nix +++ b/packages/bookwyrm/package.nix @@ -29,9 +29,7 @@ mkDerivation { pwd - ls -lAh - - touch write-test + ls -lAh / runHook postBuild '' ;