From 6ba48af816c4ce69ad52e2b8688760443bf4ca47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 26 Aug 2024 20:52:28 -0700
Subject: [PATCH 1/3] setzer: 65 -> 66

Diff: https://github.com/cvfosammmm/Setzer/compare/v65...v66
---
 pkgs/applications/editors/setzer/default.nix | 27 +++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix
index e331619d6266..11e44e4e0001 100644
--- a/pkgs/applications/editors/setzer/default.nix
+++ b/pkgs/applications/editors/setzer/default.nix
@@ -1,5 +1,5 @@
 { lib
-, python3
+, python3Packages
 , fetchFromGitHub
 , meson
 , ninja
@@ -18,19 +18,18 @@
 , webkitgtk_6_0
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "setzer";
-  version = "65";
+  version = "66";
+  pyproject = false;
 
   src = fetchFromGitHub {
     owner = "cvfosammmm";
     repo = "Setzer";
-    rev = "v${version}";
-    hash = "sha256-5Hpj/RkD11bNcr9/gQG0Y7BNMsh1BGZQiN4IMbI4osc=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hqwwDR9jCk2XptcqpaReZ73jqpq4JpYD3Rc2OmrEPxg=";
   };
 
-  format = "other";
-
   nativeBuildInputs = [
     meson
     ninja
@@ -52,7 +51,7 @@ python3.pkgs.buildPythonApplication rec {
     webkitgtk_6_0
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3Packages; [
     bibtexparser
     numpy
     pdfminer-six
@@ -64,14 +63,18 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   checkPhase = ''
+    runHook preCheck
+
     meson test --print-errorlogs
+
+    runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "LaTeX editor written in Python with Gtk";
     mainProgram = "setzer";
-    homepage = src.meta.homepage;
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dotlambda ];
+    homepage = "https://www.cvfosammmm.org/setzer/";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From a828ae56c7e854421ca601504e0b0e98eaaa37fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 26 Aug 2024 21:03:39 -0700
Subject: [PATCH 2/3] setzer: format with nixfmt-rfc-style

---
 pkgs/applications/editors/setzer/default.nix | 37 ++++++++++----------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix
index 11e44e4e0001..ee05b4cd00d1 100644
--- a/pkgs/applications/editors/setzer/default.nix
+++ b/pkgs/applications/editors/setzer/default.nix
@@ -1,21 +1,22 @@
-{ lib
-, python3Packages
-, fetchFromGitHub
-, meson
-, ninja
-, gettext
-, appstream
-, appstream-glib
-, wrapGAppsHook4
-, desktop-file-utils
-, gobject-introspection
-, gtk4
-, gtksourceview5
-, libadwaita
-, libportal
-, librsvg
-, poppler_gi
-, webkitgtk_6_0
+{
+  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 {

From 6c4cdee251da5cb0dc0d9681ec0528e8ea6075ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 26 Aug 2024 21:05:29 -0700
Subject: [PATCH 3/3] setzer: move to pkgs/by-name

---
 .../setzer/default.nix => by-name/se/setzer/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/editors/setzer/default.nix => by-name/se/setzer/package.nix} (100%)

diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/by-name/se/setzer/package.nix
similarity index 100%
rename from pkgs/applications/editors/setzer/default.nix
rename to pkgs/by-name/se/setzer/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fa33de7ebdff..38fad63adff5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12435,8 +12435,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 { };