diff --git a/packages/bookwyrm/package.nix b/packages/bookwyrm/package.nix index a027788..6006cd1 100644 --- a/packages/bookwyrm/package.nix +++ b/packages/bookwyrm/package.nix @@ -81,15 +81,6 @@ let wrapt 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 mkDerivation { @@ -118,15 +109,6 @@ mkDerivation { ln -sf $dependency/lib/python3.11/site-packages/* /build/lib/python3.11/site-packages/ 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 DOMAIN="" @@ -136,9 +118,8 @@ mkDerivation { export EMAIL_HOST_PASSWORD="" export SECRET_KEY="" - # Compile SASS - - ${python311}/bin/python manage.py compile_themes || true + ${python311}/bin/python manage.py compile_themes + ${python311}/bin/python manage.py collectstatic --no-input runHook postBuild '' ; @@ -156,15 +137,6 @@ mkDerivation { ln -sf $dependency/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ 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 cp -r $src/bookwyrm $out/lib/python3.11/site-packages/