diff --git a/machines/hadar/configuration.nix b/machines/hadar/configuration.nix index 53e1981..7089123 100644 --- a/machines/hadar/configuration.nix +++ b/machines/hadar/configuration.nix @@ -5,7 +5,7 @@ ... }: let - domain = "poy-inventree.newedge.house"; + domain = "poy-inventory.newedge.house"; in { imports = [ @@ -82,7 +82,7 @@ in services.inventree = { enable = true; hostName = "${domain}"; - config.site_url = "http://${config.services.inventree.hostName}"; + config.site_url = "https://${config.services.inventree.hostName}"; secretKeyFile = config.clan.core.vars.generators.inventree.files.secret-key.path; config.oidc_private_key_file = config.clan.core.vars.generators.inventree.files.oidc-key.path; config.adminPasswordFile = config.clan.core.vars.generators.inventree.files.admin-password.path; diff --git a/pkgs/inventree/default.nix b/pkgs/inventree/default.nix index e392f8e..00d15ac 100644 --- a/pkgs/inventree/default.nix +++ b/pkgs/inventree/default.nix @@ -7,13 +7,13 @@ nodejs, }: let - version = "unstable-2025-05-09"; + version = "1.1.0"; src = fetchFromGitHub { owner = "inventree"; repo = "InvenTree"; - rev = "e0acfaa762da0dd7b2822b567202210ca8b7dbd3"; - hash = "sha256-K+cqErDUmgPO7625P3jp7+7BOYEfyJ1nElae6RlJvvI="; + tag = "${version}"; + hash = "sha256-GAATo5zkkNCes9fCQsYUsZ9auhgYEUnevN4obWj3ZRA="; }; frontend = stdenvNoCC.mkDerivation { @@ -22,7 +22,7 @@ let yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/src/frontend/yarn.lock"; - hash = "sha256-KpWuYCrkGN+4UnwV1STEbTL0FWcLZ7Wq8a8ST55OpGM="; + hash = "sha256-Ijbkx+INZgsvMhkzo8h/FUY75W3UHnKAdUjQRD8kJZw="; }; nativeBuildInputs = [ @@ -56,73 +56,89 @@ python3.pkgs.buildPythonApplication rec { format = "other"; - dependencies = with python3.pkgs; [ - coreapi - cryptography - distutils - dj-rest-auth - django - django-allauth - django-allauth.optional-dependencies.openid - django-allauth.optional-dependencies.mfa - django-allauth.optional-dependencies.socialaccount - django-cleanup - django-cors-headers - django-dbbackup - django-error-report-2 - django-filter - django-flags - django-formtools - django-ical - django-js-asset - django-maintenance-mode - django-markdownify - django-money - django-mptt - django-redis - django-oauth-toolkit - django-otp - django-q-sentry - django-q2 - django-redis - django-sesame - django-sql-utils - django-structlog - django-stdimage - django-taggit - django-user-sessions - django-weasyprint - djangorestframework - djangorestframework-simplejwt - djangorestframework-simplejwt.optional-dependencies.crypto - django-xforwardedfor-middleware - drf-spectacular - dulwich - feedparser - gunicorn - pdf2image - pillow - pint - pip-licenses - pypdf - python-barcode - python-barcode.optional-dependencies.images - python-dotenv - pyyaml - qrcode - qrcode.optional-dependencies.pil - rapidfuzz - sentry-sdk - tablib - tablib.optional-dependencies.xls - tablib.optional-dependencies.xlsx - tablib.optional-dependencies.yaml - weasyprint - whitenoise + dependencies = + with python3.pkgs; + [ + coreapi + cryptography + distutils + dj-rest-auth + django + django-allauth + django-allauth.optional-dependencies.openid + django-allauth.optional-dependencies.mfa + django-allauth.optional-dependencies.socialaccount + django-cleanup + django-cors-headers + django-dbbackup + django-error-report-2 + django-filter + django-flags + django-formtools + django-ical + django-js-asset + django-maintenance-mode + django-markdownify + django-money + django-mptt + django-mailbox + django-anymail + django-redis + django-oauth-toolkit + django-otp + django-q-sentry + django-q2 + django-redis + django-sesame + django-sql-utils + django-structlog + django-stdimage + django-taggit + django-user-sessions + django-weasyprint + djangorestframework + djangorestframework-simplejwt + djangorestframework-simplejwt.optional-dependencies.crypto + django-xforwardedfor-middleware + django-storages + drf-spectacular + dulwich + feedparser + gunicorn + pdf2image + pillow + pint + pip-licenses + pypdf + python-barcode + python-barcode.optional-dependencies.images + python-dotenv + pyyaml + qrcode + qrcode.optional-dependencies.pil + rapidfuzz + sentry-sdk + tablib + tablib.optional-dependencies.xls + tablib.optional-dependencies.xlsx + tablib.optional-dependencies.yaml + weasyprint + whitenoise - psycopg2 - fido2 - ]; + psycopg2 + fido2 + + opentelemetry-api + opentelemetry-sdk + opentelemetry-exporter-otlp + opentelemetry-instrumentation-django + opentelemetry-instrumentation-requests + opentelemetry-instrumentation-redis + opentelemetry-instrumentation-sqlite3 + opentelemetry-instrumentation-system-metrics + opentelemetry-instrumentation-wsgi + ] + ++ django-anymail.optional-dependencies.amazon-ses; installPhase = '' substituteInPlace src/backend/InvenTree/InvenTree/settings.py --replace-fail "django_slowtests.testrunner.DiscoverSlowestTestsRunner" "django.test.runner.DiscoverRunner"