setzer: 65 -> 66 (#337623)

pkgs/applications/editors/setzer/default.nix

@@ -1,77 +0,0 @@
-{ lib
-, python3
-, fetchFromGitHub
-, meson
-, ninja
-, gettext
-, appstream
-, appstream-glib
-, wrapGAppsHook4
-, desktop-file-utils
-, gobject-introspection
-, gtk4
-, gtksourceview5
-, libadwaita
-, libportal
-, librsvg
-, poppler_gi
-, webkitgtk_6_0
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "setzer";
-  version = "65";
-
-  src = fetchFromGitHub {
-    owner = "cvfosammmm";
-    repo = "Setzer";
-    rev = "v${version}";
-    hash = "sha256-5Hpj/RkD11bNcr9/gQG0Y7BNMsh1BGZQiN4IMbI4osc=";
-  };
-
-  format = "other";
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    gettext
-    appstream # for appstreamcli
-    appstream-glib
-    wrapGAppsHook4
-    desktop-file-utils
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    gtk4
-    gtksourceview5
-    libadwaita
-    libportal
-    librsvg
-    poppler_gi
-    webkitgtk_6_0
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    bibtexparser
-    numpy
-    pdfminer-six
-    pexpect
-    pillow
-    pycairo
-    pygobject3
-    pyxdg
-  ];
-
-  checkPhase = ''
-    meson test --print-errorlogs
-  '';
-
-  meta = with lib; {
-    description = "LaTeX editor written in Python with Gtk";
-    mainProgram = "setzer";
-    homepage = src.meta.homepage;
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}

pkgs/by-name/se/setzer/package.nix

@@ -0,0 +1,81 @@
+{
+  appstream,
+  appstream-glib,
+  desktop-file-utils,
+  fetchFromGitHub,
+  gettext,
+  gobject-introspection,
+  gtk4,
+  gtksourceview5,
+  lib,
+  libadwaita,
+  libportal,
+  librsvg,
+  meson,
+  ninja,
+  poppler_gi,
+  python3Packages,
+  webkitgtk_6_0,
+  wrapGAppsHook4,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "setzer";
+  version = "66";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "cvfosammmm";
+    repo = "Setzer";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hqwwDR9jCk2XptcqpaReZ73jqpq4JpYD3Rc2OmrEPxg=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    gettext
+    appstream # for appstreamcli
+    appstream-glib
+    wrapGAppsHook4
+    desktop-file-utils
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    gtk4
+    gtksourceview5
+    libadwaita
+    libportal
+    librsvg
+    poppler_gi
+    webkitgtk_6_0
+  ];
+
+  dependencies = with python3Packages; [
+    bibtexparser
+    numpy
+    pdfminer-six
+    pexpect
+    pillow
+    pycairo
+    pygobject3
+    pyxdg
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    meson test --print-errorlogs
+
+    runHook postCheck
+  '';
+
+  meta = {
+    description = "LaTeX editor written in Python with Gtk";
+    mainProgram = "setzer";
+    homepage = "https://www.cvfosammmm.org/setzer/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}

pkgs/top-level/all-packages.nix

@@ -12428,8 +12428,6 @@ with pkgs;
 
   setserial = callPackage ../tools/system/setserial { };
 
-  setzer = callPackage ../applications/editors/setzer { };
-
   seqdiag = with python3Packages; toPythonApplication seqdiag;
 
   sequoia-sqv = callPackage ../tools/security/sequoia-sqv { };