Use 'overlappingPythonDependencies' in Bookwyrm package

This commit is contained in:
Reinout Meliesie 2025-03-09 23:36:59 +01:00
parent 89448b3ec6
commit ce05886d32
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6

View file

@ -83,12 +83,12 @@ let
] ; ] ;
overlappingPythonDependencies = [ overlappingPythonDependencies = [
opentelemetry-api { package = opentelemetry-api ; subDirectory = "opentelemetry" ; }
opentelemetry-exporter-otlp-proto-common { package = opentelemetry-exporter-otlp-proto-common ; subDirectory = "opentelemetry/exporter/otlp/proto" ; }
opentelemetry-exporter-otlp-proto-grpc { package = opentelemetry-exporter-otlp-proto-grpc ; subDirectory = "opentelemetry/exporter/otlp/proto" ; }
opentelemetry-proto { package = opentelemetry-proto ; subDirectory = "opentelemetry" ; }
opentelemetry-sdk { package = opentelemetry-sdk ; subDirectory = "opentelemetry" ; }
opentelemetry-semantic-conventions { package = opentelemetry-semantic-conventions ; subDirectory = "opentelemetry" ; }
] ; ] ;
in in
@ -117,13 +117,10 @@ 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
ln -s ${opentelemetry-api}/lib/python3.11/site-packages/opentelemetry/* /build/lib/python3.11/site-packages/opentelemetry/ ${ concatStringsSep "\n" ( map ( dependency : ''
ln -s ${opentelemetry-proto}/lib/python3.11/site-packages/opentelemetry/* /build/lib/python3.11/site-packages/opentelemetry/ ln -s ${ dependency . package }/lib/python3.11/site-packages/${ dependency . subDirectory }/* \
ln -s ${opentelemetry-sdk}/lib/python3.11/site-packages/opentelemetry/* /build/lib/python3.11/site-packages/opentelemetry/ /build/lib/python3.11/site-packages/${ dependency . subDirectory }/
ln -s ${opentelemetry-semantic-conventions}/lib/python3.11/site-packages/opentelemetry/* /build/lib/python3.11/site-packages/opentelemetry/ '' ) overlappingPythonDependencies ) }
ln -s ${opentelemetry-exporter-otlp-proto-common}/lib/python3.11/site-packages/opentelemetry/exporter/otlp/proto/* /build/lib/python3.11/site-packages/opentelemetry/exporter/otlp/proto/
ln -s ${opentelemetry-exporter-otlp-proto-grpc}/lib/python3.11/site-packages/opentelemetry/exporter/otlp/proto/* /build/lib/python3.11/site-packages/opentelemetry/exporter/otlp/proto/
export PYTHONPATH=/build/lib/python3.11/site-packages export PYTHONPATH=/build/lib/python3.11/site-packages
@ -154,6 +151,11 @@ 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 : ''
ln -s ${ dependency . package }/lib/python3.11/site-packages/${ dependency . subDirectory }/* \
/build/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/