From 4facb40bd35b0a8cddde9ad84677ce8140e8afe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Jun 2026 23:22:42 +0200 Subject: [PATCH 1/4] python314Packages.django-async-backend: init at 6.0.7 (cherry picked from commit 5387d9270224edf8b9098bcd3103489731e557ea) --- .../django-async-backend/default.nix | 74 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/python-modules/django-async-backend/default.nix diff --git a/pkgs/development/python-modules/django-async-backend/default.nix b/pkgs/development/python-modules/django-async-backend/default.nix new file mode 100644 index 000000000000..404ecff96939 --- /dev/null +++ b/pkgs/development/python-modules/django-async-backend/default.nix @@ -0,0 +1,74 @@ +{ + lib, + buildPythonPackage, + django, + fetchFromGitHub, + poetry-core, + postgresql, + postgresqlTestHook, + psycopg, + psycopg-pool, + pytest-django, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "django-async-backend"; + version = "6.0.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "Arfey"; + repo = "django-async-backend"; + tag = "v${version}"; + hash = "sha256-4zaXPfHIE9RwkSbHPt1DHFInn8LP+JXiBiMJYkZeR6M="; + }; + + postPatch = '' + substituteInPlace tests/settings.py \ + --replace-fail '"HOST": "localhost"' '"HOST": "/build/run/postgresql"' + + substituteInPlace tests/db/backends/postgresql/test_async_backend.py \ + --replace-fail "new_connection.get_database_version())[0], 15" "new_connection.get_database_version())[0], ${lib.versions.major postgresql.version}" + ''; + + build-system = [ poetry-core ]; + + dependencies = [ + django + psycopg + ]; + + pythonImportsCheck = [ "django_async_backend" ]; + + env = { + DJANGO_SETTINGS_MODULE = "settings"; + PGDATABASE = "postgres"; + PGUSER = "postgres"; + }; + + preCheck = '' + export PYTHONPATH=$PYTHONPATH:$PWD/tests + ''; + + nativeCheckInputs = [ + django # must come first as vtasks only works with django 6 + + postgresql + postgresqlTestHook + psycopg-pool + pytest-django + pytestCheckHook + ]; + + pytestFlags = [ "./tests" ]; + + meta = { + description = "Django extension providing async capabilities for database and other components"; + homepage = "https://github.com/Arfey/django-async-backend"; + changelog = "https://github.com/Arfey/django-async-backend/releases/tag/${src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + broken = lib.versionOlder (lib.versions.major django.version) "6"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ade4902532bd..e54a0695d28e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4120,6 +4120,8 @@ self: super: with self; { django-apscheduler = callPackage ../development/python-modules/django-apscheduler { }; + django-async-backend = callPackage ../development/python-modules/django-async-backend { }; + django-auditlog = callPackage ../development/python-modules/django-auditlog { }; django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { From 694702a469246dbc2b641c4b7b29eea0b7cab035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 18 Jun 2026 18:56:45 +0200 Subject: [PATCH 2/4] glitchtip: add missing dependency Required since https://gitlab.com/glitchtip/glitchtip-backend/-/merge_requests/2343 which is contained in 6.1.7 I did not see any errors related to that, might be that it is just indirectly drawn in somewhere. (cherry picked from commit 9d24cd9b5f1f008d71f50519f9f5b75ff2db37dd) --- pkgs/by-name/gl/glitchtip/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix index 194c96134d45..60e7ef7aae3a 100644 --- a/pkgs/by-name/gl/glitchtip/package.nix +++ b/pkgs/by-name/gl/glitchtip/package.nix @@ -29,6 +29,7 @@ let django django-allauth django-anymail + django-async-backend django-cors-headers django-environ django-extensions From 8adafc6f3572ac454077ab7570fdbfcb05a21a73 Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 1 Jul 2026 00:58:26 +0200 Subject: [PATCH 3/4] python3Packages.django-vtasks: 2.1.1 -> 2.1.2 Changelog: https://gitlab.com/glitchtip/django-vtasks/-/releases/v2.1.2 Diff: https://gitlab.com/glitchtip/django-vtasks/-/compare/v2.1.1...v2.1.2 (cherry picked from commit 2606a235af555f170d1564b67a6b7354318a81ba) --- pkgs/development/python-modules/django-vtasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-vtasks/default.nix b/pkgs/development/python-modules/django-vtasks/default.nix index d890b5894ef3..f582ae5992e9 100644 --- a/pkgs/development/python-modules/django-vtasks/default.nix +++ b/pkgs/development/python-modules/django-vtasks/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "django-vtasks"; - version = "2.1.1"; + version = "2.1.2"; pyproject = true; src = fetchFromGitLab { owner = "glitchtip"; repo = "django-vtasks"; tag = "v${version}"; - hash = "sha256-f9x6atPMYgQQ/jpCJdDj33l+mhyei+6IWi4bqqVWxU8="; + hash = "sha256-L2desiA5ZSdW6KcWuJ4UmtqDVuvAFeRplLgJex7inVM="; }; postPatch = '' From d164d4f9ce58aeda7e39018e9115bc89ac59470b Mon Sep 17 00:00:00 2001 From: Defelo Date: Wed, 1 Jul 2026 00:22:15 +0200 Subject: [PATCH 4/4] glitchtip: 6.1.8 -> 6.2.0 Changelog: https://gitlab.com/glitchtip/glitchtip-backend/-/blob/v6.2.0/CHANGELOG Diff: https://gitlab.com/glitchtip/glitchtip-backend/-/compare/v6.1.8...v6.2.0 (cherry picked from commit 4a121cc25a66c3b9c11bd830f71be98367404829) --- pkgs/by-name/gl/glitchtip/frontend.nix | 6 +-- pkgs/by-name/gl/glitchtip/glitchtip-rust.nix | 42 ++++++++++++++++++++ pkgs/by-name/gl/glitchtip/package.nix | 9 +++-- pkgs/by-name/gl/glitchtip/update.sh | 1 + 4 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 pkgs/by-name/gl/glitchtip/glitchtip-rust.nix diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix index e57cd1aef060..86c37d73d166 100644 --- a/pkgs/by-name/gl/glitchtip/frontend.nix +++ b/pkgs/by-name/gl/glitchtip/frontend.nix @@ -10,13 +10,13 @@ buildNpmPackage (finalAttrs: { pname = "glitchtip-frontend"; - version = "6.1.8"; + version = "6.2.0"; src = fetchFromGitLab { owner = "glitchtip"; repo = "glitchtip-frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-y8NPj1xjGnGS9yBFaRjFRxLdTGrAq08T9N7cZN5IeSc="; + hash = "sha256-iKY1w9lmfuyvDblH/TlnUwAnda17qWGxmx1qtmQRENg="; }; nodejs = nodejs_22; @@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; npmDepsFetcherVersion = 3; - hash = "sha256-AIzPJpNvGV/U71UFAUwOqx8kb31s7LXhMha4bXV+oCU="; + hash = "sha256-V9aRKoJ6+BN/q7NS21eZBopzkWje8sOGGL1AgO4cUM0="; }; postPatch = '' diff --git a/pkgs/by-name/gl/glitchtip/glitchtip-rust.nix b/pkgs/by-name/gl/glitchtip/glitchtip-rust.nix new file mode 100644 index 000000000000..455d00a4614a --- /dev/null +++ b/pkgs/by-name/gl/glitchtip/glitchtip-rust.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitLab, + rustPlatform, +}: + +buildPythonPackage (finalAttrs: { + pname = "glitchtip-rust"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitLab { + owner = "glitchtip"; + repo = "glitchtip-rust"; + tag = "v${finalAttrs.version}"; + hash = "sha256-0FG+seIWqfyOG3JR0WF4ICnxMAPx9FO0JyFSB43CttU="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-14j7h4TgQhTE5oihnvjAxtGZhPajuTRD4Cga8xzN9Lg="; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + pythonImportsCheck = [ "gt_rust" ]; + + meta = { + description = "Rust components of GlitchTip Backend"; + homepage = "https://glitchtip.com"; + changelog = "https://gitlab.com/glitchtip/glitchtip-rust/-/tags/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + defelo + felbinger + ]; + }; +}) diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix index 60e7ef7aae3a..a623377e0b95 100644 --- a/pkgs/by-name/gl/glitchtip/package.nix +++ b/pkgs/by-name/gl/glitchtip/package.nix @@ -13,6 +13,7 @@ let self = python; packageOverrides = final: prev: { django = final.django_6; + glitchtip-rust = final.callPackage ./glitchtip-rust.nix { }; }; }; @@ -24,7 +25,6 @@ let arro3-core arro3-io boto3 - brotli cxxfilt django django-allauth @@ -46,8 +46,10 @@ let duckdb google-cloud-logging granian + glitchtip-rust mcp minidump + opentelemetry-proto orjson psycopg pydantic @@ -77,14 +79,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glitchtip"; - version = "6.1.8"; + version = "6.2.0"; pyproject = true; src = fetchFromGitLab { owner = "glitchtip"; repo = "glitchtip-backend"; tag = "v${finalAttrs.version}"; - hash = "sha256-4RAZYGoS1tUbcPVv8L0sFWqFfBX05yXKZHFZDbEn0C0="; + hash = "sha256-E1YwJwfL5+Q68xRfnoi2Sg+vAZxGQa0IKfOSVuLVnK0="; }; postPatch = '' @@ -128,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit frontend python; + inherit (python.pkgs) glitchtip-rust; tests = { inherit (nixosTests) glitchtip; }; updateScript = ./update.sh; }; diff --git a/pkgs/by-name/gl/glitchtip/update.sh b/pkgs/by-name/gl/glitchtip/update.sh index e0a5cf370e59..33816b26d0b3 100755 --- a/pkgs/by-name/gl/glitchtip/update.sh +++ b/pkgs/by-name/gl/glitchtip/update.sh @@ -7,3 +7,4 @@ version=$(curl ${GITLAB_TOKEN:+-H "Private-Token: $GITLAB_TOKEN"} -sL https://gi nix-update --version="$version" glitchtip nix-update --version="$version" glitchtip.frontend +nix-update glitchtip.glitchtip-rust