From b4248670b88856cdfad6cf3409a8802c539b8afe Mon Sep 17 00:00:00 2001 From: Reinout Meliesie Date: Mon, 3 Mar 2025 17:52:57 +0100 Subject: [PATCH] Add dependencies for all Python packages, use release tags if latest --- python3.11-bw-file-resubmit.nix | 9 ++++++- python3.11-django-imagekit.nix | 11 ++++++++ python3.11-django-pgtrigger.nix | 19 +++++++++++--- python3.11-django-sass-processor.nix | 39 +++++++++++++++++++++++++--- python3.11-s3-tar.nix | 10 +++++++ 5 files changed, 81 insertions(+), 7 deletions(-) diff --git a/python3.11-bw-file-resubmit.nix b/python3.11-bw-file-resubmit.nix index e6626fc..10a88fd 100644 --- a/python3.11-bw-file-resubmit.nix +++ b/python3.11-bw-file-resubmit.nix @@ -4,6 +4,7 @@ stdenv , } : +with pkgs . python311Packages ; with stdenv ; mkDerivation { @@ -25,7 +26,13 @@ mkDerivation { runHook preInstall mkdir -p $out/lib/python3.11/site-packages - ln -s ${ pkgs . python311Packages . django }/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + + # Dependencies + + ln -s ${django}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + + # The package itself + cp -r $src/src/file_resubmit $out/lib/python3.11/site-packages/ runHook postInstall diff --git a/python3.11-django-imagekit.nix b/python3.11-django-imagekit.nix index f7b8bfa..f9e1006 100644 --- a/python3.11-django-imagekit.nix +++ b/python3.11-django-imagekit.nix @@ -1,8 +1,10 @@ { fetchFromGitHub , + pkgs , stdenv , } : +with pkgs . python311Packages ; with stdenv ; mkDerivation { @@ -24,6 +26,15 @@ mkDerivation { runHook preInstall mkdir -p $out/lib/python3.11/site-packages + + # Dependencies + + ln -s ${django}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + ln -s ${django-appconf}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + ln -s ${pilkit}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + + # The package itself + cp -r $src/imagekit $out/lib/python3.11/site-packages/ runHook postInstall diff --git a/python3.11-django-pgtrigger.nix b/python3.11-django-pgtrigger.nix index 243219e..4ed6ce0 100644 --- a/python3.11-django-pgtrigger.nix +++ b/python3.11-django-pgtrigger.nix @@ -1,18 +1,20 @@ { fetchFromGitHub , + pkgs , stdenv , } : +with pkgs . python311Packages ; with stdenv ; mkDerivation { pname = "python-django-pgtrigger" ; - version = "2024-12-24-fa2155e" ; + version = "4.13.3" ; src = fetchFromGitHub { owner = "ambitioneng" ; repo = "django-pgtrigger" ; - rev = "fa2155e630da8752a22a6c4ab81eb0e19f5979eb" ; + rev = "4.13.3" ; hash = "sha256-K+JjAermtSiVUnPbtyabpQN2ghnRIkwt329Ytp8zeQk=" ; } ; @@ -24,10 +26,21 @@ mkDerivation { runHook preInstall mkdir -p $out/lib/python3.11/site-packages/pgtrigger + + # Dependencies + + ln -s ${django}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + ln -s ${psycopg}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + + # The package itself + cp $src/pgtrigger/*.py $out/lib/python3.11/site-packages/pgtrigger/ cp -r $src/pgtrigger/management $out/lib/python3.11/site-packages/pgtrigger/ - + + # Metadata + mkdir -p $out/lib/python3.11/site-packages/django_pgtrigger-4.13.3.dist-info + cat << EOF > $out/lib/python3.11/site-packages/django_pgtrigger-4.13.3.dist-info/METADATA Metadata-Version: 2.1 Name: django-pgtrigger diff --git a/python3.11-django-sass-processor.nix b/python3.11-django-sass-processor.nix index 52134f4..49fec64 100644 --- a/python3.11-django-sass-processor.nix +++ b/python3.11-django-sass-processor.nix @@ -1,18 +1,23 @@ { fetchFromGitHub , + pkgs , stdenv , + + offlineCompilation ? false , + jinjaSupport ? false , } : +with pkgs . python311Packages ; with stdenv ; mkDerivation { pname = "python-django-sass-processor" ; - version = "2024-05-29-0d8cb67" ; + version = "1.4.1" ; src = fetchFromGitHub { owner = "jrief" ; repo = "django-sass-processor" ; - rev = "0d8cb672aab9ecc45e8492794530ca847ce24547" ; + rev = "1.4.1" ; hash = "sha256-Z3UzzkHlMNiyhj7YPRDgAX0437BywPG/waNSPoNiKLo=" ; } ; @@ -24,7 +29,35 @@ mkDerivation { runHook preInstall mkdir -p $out/lib/python3.11/site-packages - cp -r $src/sass_processor $out/lib/python3.11/site-packages/ + + # Dependencies + + ln -s ${django}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + + ${ if offlineCompilation then '' + ln -s ${django-compressor}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + '' else '' + ln -s ${libsass}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + '' } + + ${ if jinjaSupport then '' + ln -s ${jinja2}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + '' else "" } + + mkdir $out/lib/python3.11/site-packages/sass_processor + + # The package itself + + cp $src/sass_processor/*.py $out/lib/python3.11/site-packages/sass_processor/ + + ${ if offlineCompilation then '' + cp -r $src/sass_processor/management $out/lib/python3.11/site-packages/sass_processor/ + cp -r $src/sass_processor/templatetags $out/lib/python3.11/site-packages/sass_processor/ + '' else "" } + + ${ if jinjaSupport then '' + cp -r $src/sass_processor/jinja2 $out/lib/python3.11/site-packages/sass_processor/ + '' else "" } runHook postInstall '' ; diff --git a/python3.11-s3-tar.nix b/python3.11-s3-tar.nix index f6047f0..133dbea 100644 --- a/python3.11-s3-tar.nix +++ b/python3.11-s3-tar.nix @@ -1,8 +1,10 @@ { fetchFromGitHub , + pkgs, stdenv , } : +with pkgs . python311Packages ; with stdenv ; mkDerivation { @@ -24,6 +26,14 @@ mkDerivation { runHook preInstall mkdir -p $out/lib/python3.11/site-packages + + # Dependencies + + ln -s ${boto3}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + ln -s ${botocore}/lib/python3.11/site-packages/* $out/lib/python3.11/site-packages/ + + # The package itself + cp -r $src/s3_tar $out/lib/python3.11/site-packages/ runHook postInstall