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

Remove 'opentelemetry' deps, add 'collectstatic' to Bookwyrm package

Browse source
This commit is contained in:
Reinout Meliesie 2025-03-10 19:00:42 +01:00
parent 35ba421004
commit 54dfdc52dc
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
1 changed files with 2 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

32
packages/bookwyrm/package.nix
View file

@ -81,15 +81,6 @@ let
wrapt wrapt
yarl yarl
] ; ] ;
overlappingPythonDependencies = [
{ package = opentelemetry-api ; subDirectory = "opentelemetry" ; }
{ package = opentelemetry-exporter-otlp-proto-common ; subDirectory = "opentelemetry/exporter/otlp/proto" ; }
{ package = opentelemetry-exporter-otlp-proto-grpc ; subDirectory = "opentelemetry/exporter/otlp/proto" ; }
{ package = opentelemetry-proto ; subDirectory = "opentelemetry" ; }
{ package = opentelemetry-sdk ; subDirectory = "opentelemetry" ; }
{ package = opentelemetry-semantic-conventions ; subDirectory = "opentelemetry" ; }
] ;
in in
mkDerivation { mkDerivation {
@ -118,15 +109,6 @@ mkDerivation {
ln -sf $dependency/lib/python3.11/site-packages/* /build/lib/python3.11/site-packages/ ln -sf $dependency/lib/python3.11/site-packages/* /build/lib/python3.11/site-packages/
done done
${ concatStringsSep "\n" ( map ( dependency : ''
mkdir -p /build/lib/python3.11/site-packages/${ dependency . subDirectory }
ln -s ${ dependency . package }/lib/python3.11/site-packages/${ dependency . subDirectory }/* \
/build/lib/python3.11/site-packages/${ dependency . subDirectory }/
'' ) overlappingPythonDependencies ) }
export PYTHONPATH=/build/lib/python3.11/site-packages export PYTHONPATH=/build/lib/python3.11/site-packages
export DOMAIN="" export DOMAIN=""
@ -136,9 +118,8 @@ mkDerivation {
export EMAIL_HOST_PASSWORD="" export EMAIL_HOST_PASSWORD=""
export SECRET_KEY="" export SECRET_KEY=""
# Compile SASS ${python311}/bin/python manage.py compile_themes
${python311}/bin/python manage.py collectstatic --no-input
${python311}/bin/python manage.py compile_themes || true
runHook postBuild runHook postBuild
'' ; '' ;
@ -156,15 +137,6 @@ mkDerivation {
ln -sf $dependency/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ ln -sf $dependency/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/
done done
${ concatStringsSep "\n" ( map ( dependency : ''
mkdir -p $out/lib/python3.11/site-packages/${ dependency . subDirectory }
ln -s ${ dependency . package }/lib/python3.11/site-packages/${ dependency . subDirectory }/* \
$out/lib/python3.11/site-packages/${ dependency . subDirectory }/
'' ) overlappingPythonDependencies ) }
# Python packages # Python packages
cp -r $src/bookwyrm $out/lib/python3.11/site-packages/ cp -r $src/bookwyrm $out/lib/python3.11/site-packages/