bumped sources

- ssh boot - removed /32, otherwise we got error
  `can't parse IP address "xx.xx.xx.xx/32"`
- wger - cleaned up, because of deprecated errors

machines/gerd/services/wger/wgerpkg/default.nix

@@ -1,15 +1,57 @@
 {
-  lib,
-  python3,
-  fetchFromGitHub,
-  callPackage,
-  writeText,
-  fetchpatch,
+  lib
+,  python
+,  fetchFromGitHub
+,  buildPythonPackage
+,  callPackage
+,  writeText
+,  fetchpatch
+# build systems
+, hatchling
+# deps
+, bleach
+, celery
+, django-crispy-bootstrap5
+, django
+, django-activity-stream ? callPackage ./django-activity-stream.nix {}
+, django-axes
+, django-compressor
+, django-cors-headers
+, django-crispy-forms
+, django-email-verification ? callPackage ./django-email-verification.nix {}
+, django-environ
+, django-filter
+, django-formtools
+, django-prometheus
+, django-recaptcha ? callPackage ./django-recaptcha.nix {}
+, django-simple-history
+, django-sortedm2m ? callPackage ./django-sortedm2m.nix {}
+, django-storages
+, djangorestframework
+, djangorestframework-simplejwt
+, drf-spectacular
+, easy-thumbnails
+, flower
+, fontawesomefree
+, icalendar
+, invoke
+, openfoodfacts ? callPackage ./openfoodfacts.nix {}
+, pillow
+, reportlab
+, requests
+, tqdm
+, tzdata
+# extra deps
+, redis
+, django-redis
+, drf-spectacular-sidecar
+, django-bootstrap-breadcrumbs ? callPackage ./django-bootstrap-breadcrumbs.nix {}
+, psycopg2
 }:
 
 let
   frontend = callPackage ./frontend.nix {};
-in python3.pkgs.buildPythonPackage rec {
+in buildPythonPackage rec {
   pname = "wger";
   version = "2.3";
   pyproject = true;
@@ -22,7 +64,7 @@ in python3.pkgs.buildPythonPackage rec {
   };
 
   build-system = [
-    python3.pkgs.hatchling
+    hatchling
   ];
 
   patches = [
@@ -38,28 +80,24 @@ in python3.pkgs.buildPythonPackage rec {
   ];
 
   # dependencies = with python3.pkgs; [
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = [
     bleach
     celery
     django-crispy-bootstrap5
     django
-    # django-activity-stream
-    (python3.pkgs.callPackage ./django-activity-stream.nix {})
+    django-activity-stream
     django-axes
     django-compressor
     django-cors-headers
     django-crispy-forms
-    # django-email-verification
-    (python3.pkgs.callPackage ./django-email-verification.nix {})
+    django-email-verification
     django-environ
     django-filter
     django-formtools
     django-prometheus
-    # django-recaptcha
-    (python3.pkgs.callPackage ./django-recaptcha.nix {})
+    django-recaptcha
     django-simple-history
-    # django-sortedm2m
-    (python3.pkgs.callPackage ./django-sortedm2m.nix {})
+    django-sortedm2m
     django-storages
     djangorestframework
     djangorestframework-simplejwt
@@ -69,8 +107,7 @@ in python3.pkgs.buildPythonPackage rec {
     fontawesomefree
     icalendar
     invoke
-    # openfoodfacts
-    (python3.pkgs.callPackage ./openfoodfacts.nix {})
+    openfoodfacts
     pillow
     reportlab
     requests
@@ -81,7 +118,7 @@ in python3.pkgs.buildPythonPackage rec {
     redis
     django-redis
     drf-spectacular-sidecar
-    (python3.pkgs.callPackage ./django-bootstrap-breadcrumbs.nix {})
+    django-bootstrap-breadcrumbs
     psycopg2
   ];
 
@@ -102,7 +139,7 @@ in python3.pkgs.buildPythonPackage rec {
     '';
   in ''
     # copy over static yarn things
-    # cp -a ${frontend}/static/yarn $out/${python3.sitePackages}/wger/core/static
+    # cp -a ${frontend}/static/yarn $out/${python.sitePackages}/wger/core/static
     cp -a ${frontend}/static/yarn wger/core/static
 
     python3 -m wger create-settings -s $PWD/tmp_settings.py
@@ -110,18 +147,18 @@ in python3.pkgs.buildPythonPackage rec {
     mkdir tmpstatic
     pushd tmpstatic
 
-    static=. WGER_SETTINGS=../tmp_settings.py python3 ../manage.py collectstatic --no-input
-    static=. WGER_SETTINGS=../tmp_settings.py python3 ../manage.py compress --force
+    static=. WGER_SETTINGS=../tmp_settings.py python ../manage.py collectstatic --no-input
+    static=. WGER_SETTINGS=../tmp_settings.py python ../manage.py compress --force
 
     popd
   '';
 
   postInstall = ''
-    rm -rf $out/${python3.sitePackages}/wger/core/static
-    cp -a tmpstatic $out/${python3.sitePackages}/wger/core/static
+    rm -rf $out/${python.sitePackages}/wger/core/static
+    cp -a tmpstatic $out/${python.sitePackages}/wger/core/static
 
     mkdir $out/share
-    cp -a $out/${python3.sitePackages}/wger/core/static $out/share
+    cp -a $out/${python.sitePackages}/wger/core/static $out/share
   '';
 
   pythonImportsCheck = [