glitchtip: 4.2.5 -> 4.2.10, refactor (#398613)

pkgs/by-name/gl/glitchtip/frontend.nix

@@ -2,29 +2,36 @@
   lib,
   fetchFromGitLab,
   buildNpmPackage,
+  fetchNpmDeps,
   jq,
   moreutils,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "glitchtip-frontend";
-  version = "4.2.5";
+  version = "4.2.10";
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yLpDjHnt8ZwpT+KlmEtXMYgrpnbYlVzJ/MZMELVO/j8=";
+    hash = "sha256-6ZOwAP6VB/uBrV6Yjc9jvzTNdfInekbLO/9PO57S9X8=";
   };
 
-  npmDepsHash = "sha256-sR/p/JRVuaemN1euZ/VrJ0j1q7fkS/Zi6R1m6lPvygs=";
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-uEyET3y8LfjTasaJ+Hl206/Q7ov69mA7oNa0mhgcUEQ=";
+  };
 
   postPatch = ''
-    ${lib.getExe jq} '. + {
-      "devDependencies": .devDependencies | del(.cypress, ."cypress-localstorage-commands")
-    }' package.json | ${lib.getExe' moreutils "sponge"} package.json
+    jq '.devDependencies |= del(.cypress, ."cypress-localstorage-commands")' package.json | sponge package.json
   '';
 
+  nativeBuildInputs = [
+    moreutils
+    jq
+  ];
+
   buildPhase = ''
     runHook preBuild
 

pkgs/by-name/gl/glitchtip/package.nix

@@ -25,7 +25,6 @@ let
       brotli
       celery
       celery-batches
-      dj-stripe
       django
       django-allauth
       django-anymail
@@ -39,7 +38,6 @@ let
       django-organizations
       django-prometheus
       django-redis
-      django-sql-utils
       django-storages
       google-cloud-logging
       gunicorn
@@ -47,7 +45,7 @@ let
       psycopg
       pydantic
       sentry-sdk
-      symbolic
+      symbolic_10
       user-agents
       uvicorn
       uwsgi-chunked
@@ -69,14 +67,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glitchtip";
-  version = "4.2.5";
+  version = "4.2.10";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-backend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OTf2rvx+ONnB7pLB7rinztXL7l2eZfIuI7PosCXaOH8=";
+    hash = "sha256-EGk/mhDlqGrJm/j5rTKeKRkJ/fRTspwtPJ+5OHwplfM=";
   };
 
   propagatedBuildInputs = pythonPackages;

pkgs/by-name/gl/glitchtip/update.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p nix-update
+#!nix-shell -i bash -p curl jq nix-update
 
-nix-update glitchtip
-nix-update glitchtip.frontend
+set -eou pipefail
+
+version=$(curl ${GITLAB_TOKEN:+-H "Private-Token: $GITLAB_TOKEN"} -sL https://gitlab.com/api/v4/projects/15450933/repository/tags | jq -r '.[0].name')
+
+nix-update --version="$version" glitchtip
+nix-update --version="$version" glitchtip.frontend

pkgs/development/python-modules/symbolic/10.nix

@@ -0,0 +1,76 @@
+{
+  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 ];
+  };
+}

pkgs/development/python-modules/symbolic/default.nix

@@ -9,12 +9,11 @@
   milksnake,
   cffi,
   pytestCheckHook,
-  nixosTests,
 }:
 
 buildPythonPackage rec {
   pname = "symbolic";
-  version = "12.14.1"; # glitchtip currently only works with symbolic 10.x
+  version = "12.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -22,16 +21,12 @@ buildPythonPackage rec {
     repo = "symbolic";
     tag = version;
     hash = "sha256-u3nEYvnt2P+W/0zYctikMgdkalej86eCYhfWj9LW4pU=";
-    # for some reason the `py` directory in the tarball is empty, so we fetch the source via git instead
+    # 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
-      ;
+    inherit pname version src;
     hash = "sha256-X8IjmSQD32bougiUFyuk8OOGIzIQgk/TjVM5bgUey5M=";
   };
 
@@ -59,8 +54,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "symbolic" ];
 
-  passthru.tests = { inherit (nixosTests) glitchtip; };
-
   meta = {
     description = "Python library for dealing with symbol files and more";
     homepage = "https://github.com/getsentry/symbolic";

pkgs/top-level/python-packages.nix

@@ -16792,6 +16792,8 @@ 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 { };