zedfrigg/nix-packages
1
0
Fork 0
Code Issues Pull requests Activity Actions

Compare commits

base: zedfrigg:4ef542df06f2230e40dbb77071487599e777b8d1
Branches Tags
zedfrigg:master
...
compare: zedfrigg:5af00580bbc7fbc7a1df58c7b010663e7c3dbb2d
Branches Tags
zedfrigg:master

2 commits
4ef542df06 ... 5af00580bb

Author SHA1 Message Date
Reinout Meliesie
5af00580bb
Update Bookwyrm git rev to 229a035a2b, remove 'bookwyrm-env' Redis vars 
The Redis environment variables belong in '/etc/bookwyrm/config.env'.
 2025-03-13 15:11:35 +01:00
Reinout Meliesie
7754ddbed1
Ensure 'images' directory exists in Bookwyrm systemd unit 2025-03-13 15:07:30 +01:00
2 changed files with 3 additions and 4 deletions
Show stats Expand all files Collapse all files

1
packages/bookwyrm/nixos-module.nix
View file

@ -16,6 +16,7 @@ with pkgs . kernelmaft ;
# 'initdb' fails harmlessly if it has been run on the database before # '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=${coreutils-full}/bin/ln -sf ${bookwyrm}/var/lib/bookwyrm/VERSION /var/lib/bookwyrm/
ExecStartPre=mkdir -p /var/lib/bookwyrm/images
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 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 ExecStart=${bookwyrm}/bin/bookwyrm-env ${bookwyrm}/bin/bookwyrm

6
packages/bookwyrm/package.nix
View file

@ -91,8 +91,8 @@ mkDerivation {
domain = "kernelmaft.com/forgejo" ; domain = "kernelmaft.com/forgejo" ;
owner = "zedfrigg" ; owner = "zedfrigg" ;
repo = "bookwyrm" ; repo = "bookwyrm" ;
rev = "984b9b08fc1219be5581e339c00d51d7f956fc3f" ; rev = "229a035a2be1811123b5afcb035fab61d13f0a47" ;
hash = "sha256-mhULkMLm4g+J/UoPWRpoh0CXcFQ4MhkP0xKJvTzJVSM=" ; hash = "sha256-0pwszQwx/RsCv3pxGifyAEpzXfTBiwOOt+h3pZuN3Bk=" ;
} ; } ;
dontPatch = true ; dontPatch = true ;
@ -179,8 +179,6 @@ mkDerivation {
export PYTHONPATH=$out/lib/python3.11/site-packages export PYTHONPATH=$out/lib/python3.11/site-packages
export DEBUG=false export DEBUG=false
export REDIS_ACTIVITY_URL=unix:///run/redis-bookwyrm-activity/redis.sock
export REDIS_BROKER_URL=unix:///run/redis-bookwyrm-broker/redis.sock
export STATIC_ROOT_ABS=$out/srv/http export STATIC_ROOT_ABS=$out/srv/http
exec \$@ exec \$@