diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix index c046a85f59b1..83fe0368f370 100644 --- a/pkgs/by-name/gl/glitchtip/package.nix +++ b/pkgs/by-name/gl/glitchtip/package.nix @@ -2,6 +2,8 @@ lib, python313, fetchFromGitLab, + fetchFromGitHub, + rustPlatform, callPackage, stdenv, makeWrapper, @@ -10,9 +12,27 @@ let python = python313.override { + self = python; packageOverrides = final: prev: { django = final.django_5; - django-extensions = prev.django-extensions.overridePythonAttrs { doCheck = false; }; + symbolic = prev.symbolic.overridePythonAttrs rec { + version = "10.2.1"; + src = fetchFromGitHub { + owner = "getsentry"; + repo = "symbolic"; + tag = version; + hash = "sha256-3u4MTzaMwryGpFowrAM/MJOmnU8M+Q1/0UtALJib+9A="; + # the `py` directory is not included in the tarball, so we fetch the source via git instead + forceFetchGit = true; + }; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit src postPatch; + hash = "sha256-cpIVzgcxKfEA5oov6/OaXqknYsYZUoduLTn2qIXGL5U="; + }; + postPatch = '' + ln -s ${./symbolic_Cargo.lock} Cargo.lock + ''; + }; }; }; @@ -45,7 +65,7 @@ let psycopg pydantic sentry-sdk - symbolic_10 + symbolic user-agents uvicorn uwsgi-chunked diff --git a/pkgs/development/python-modules/symbolic/Cargo.lock b/pkgs/by-name/gl/glitchtip/symbolic_Cargo.lock similarity index 100% rename from pkgs/development/python-modules/symbolic/Cargo.lock rename to pkgs/by-name/gl/glitchtip/symbolic_Cargo.lock diff --git a/pkgs/development/python-modules/symbolic/10.nix b/pkgs/development/python-modules/symbolic/10.nix deleted file mode 100644 index 13a43365c9b5..000000000000 --- a/pkgs/development/python-modules/symbolic/10.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - setuptools-rust, - rustPlatform, - rustc, - cargo, - milksnake, - cffi, - pytestCheckHook, - nixosTests, -}: - -buildPythonPackage rec { - pname = "symbolic"; - version = "10.2.1"; # glitchtip currently only works with symbolic 10.x - pyproject = true; - - src = fetchFromGitHub { - owner = "getsentry"; - repo = "symbolic"; - tag = version; - hash = "sha256-3u4MTzaMwryGpFowrAM/MJOmnU8M+Q1/0UtALJib+9A="; - # the `py` directory is not included in the tarball, so we fetch the source via git instead - forceFetchGit = true; - }; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit - pname - version - src - postPatch - ; - hash = "sha256-cpIVzgcxKfEA5oov6/OaXqknYsYZUoduLTn2qIXGL5U="; - }; - - nativeBuildInputs = [ - setuptools-rust - rustPlatform.cargoSetupHook - rustc - cargo - milksnake - ]; - - dependencies = [ cffi ]; - - postPatch = '' - ln -s ${./Cargo.lock} Cargo.lock - ''; - - preBuild = '' - cd py - ''; - - preCheck = '' - cd .. - ''; - - nativeCheckInputs = [ pytestCheckHook ]; - - pytestFlagsArray = [ "py" ]; - - pythonImportsCheck = [ "symbolic" ]; - - passthru.tests = { inherit (nixosTests) glitchtip; }; - - meta = { - description = "Python library for dealing with symbol files and more"; - homepage = "https://github.com/getsentry/symbolic"; - changelog = "https://github.com/getsentry/symbolic/blob/${version}/CHANGELOG.md"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ defelo ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36a168818769..1db0068664d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16810,8 +16810,6 @@ self: super: with self; { symbolic = callPackage ../development/python-modules/symbolic { }; - symbolic_10 = callPackage ../development/python-modules/symbolic/10.nix { }; - symengine = callPackage ../development/python-modules/symengine { inherit (pkgs) symengine; }; symfc = callPackage ../development/python-modules/symfc { };