From 0431d8684e8fb1c23ee75eb9cf24d9c16cf20c5d Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:49:03 +0100
Subject: [PATCH 1/2] gramps: move to pkgs/by-name

---
 .../gramps/check-locale-hasattr-textdomain.patch |  0
 .../gr}/gramps/disable-gtk-warning-dialog.patch  |  0
 .../gr/gramps/package.nix}                       | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  4 ----
 4 files changed, 8 insertions(+), 12 deletions(-)
 rename pkgs/{applications/misc => by-name/gr}/gramps/check-locale-hasattr-textdomain.patch (100%)
 rename pkgs/{applications/misc => by-name/gr}/gramps/disable-gtk-warning-dialog.patch (100%)
 rename pkgs/{applications/misc/gramps/default.nix => by-name/gr/gramps/package.nix} (89%)

diff --git a/pkgs/applications/misc/gramps/check-locale-hasattr-textdomain.patch b/pkgs/by-name/gr/gramps/check-locale-hasattr-textdomain.patch
similarity index 100%
rename from pkgs/applications/misc/gramps/check-locale-hasattr-textdomain.patch
rename to pkgs/by-name/gr/gramps/check-locale-hasattr-textdomain.patch
diff --git a/pkgs/applications/misc/gramps/disable-gtk-warning-dialog.patch b/pkgs/by-name/gr/gramps/disable-gtk-warning-dialog.patch
similarity index 100%
rename from pkgs/applications/misc/gramps/disable-gtk-warning-dialog.patch
rename to pkgs/by-name/gr/gramps/disable-gtk-warning-dialog.patch
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/by-name/gr/gramps/package.nix
similarity index 89%
rename from pkgs/applications/misc/gramps/default.nix
rename to pkgs/by-name/gr/gramps/package.nix
index 91e1e5853cf8..5924ed67d4b8 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/by-name/gr/gramps/package.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   gtk3,
-  pythonPackages,
+  python3Packages,
   glibcLocales,
   intltool,
   gexiv2,
@@ -21,7 +21,7 @@
 }:
 
 let
-  inherit (pythonPackages) buildPythonApplication pythonOlder;
+  inherit (python3Packages) buildPythonApplication pythonOlder;
 in
 buildPythonApplication rec {
   version = "5.2.3";
@@ -49,15 +49,15 @@ buildPythonApplication rec {
     intltool
     gettext
     gobject-introspection
-    pythonPackages.setuptools
+    python3Packages.setuptools
   ];
 
   nativeCheckInputs = [
     glibcLocales
-    pythonPackages.unittestCheckHook
-    pythonPackages.jsonschema
-    pythonPackages.mock
-    pythonPackages.lxml
+    python3Packages.unittestCheckHook
+    python3Packages.jsonschema
+    python3Packages.mock
+    python3Packages.lxml
   ];
 
   buildInputs =
@@ -76,7 +76,7 @@ buildPythonApplication rec {
     # Ghostscript support
     ++ lib.optional enableGhostscript ghostscript;
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python3Packages; [
     berkeleydb
     pyicu
     pygobject3
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c7e14fba420..a657777af877 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13726,10 +13726,6 @@ with pkgs;
 
   gphoto2fs = callPackage ../applications/misc/gphoto2/gphotofs.nix { };
 
-  gramps = callPackage ../applications/misc/gramps {
-        pythonPackages = python3Packages;
-  };
-
   graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
   graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;
 

From 3bf3d7677ee00996af3674ef9b381531301e28e3 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 15 Jan 2025 16:49:36 +0100
Subject: [PATCH 2/2] gramps: 5.2.3 -> 5.2.4

---
 pkgs/by-name/gr/gramps/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/gramps/package.nix b/pkgs/by-name/gr/gramps/package.nix
index 5924ed67d4b8..1c3aed85a1c3 100644
--- a/pkgs/by-name/gr/gramps/package.nix
+++ b/pkgs/by-name/gr/gramps/package.nix
@@ -24,7 +24,7 @@ let
   inherit (python3Packages) buildPythonApplication pythonOlder;
 in
 buildPythonApplication rec {
-  version = "5.2.3";
+  version = "5.2.4";
   pname = "gramps";
   pyproject = true;
 
@@ -34,7 +34,7 @@ buildPythonApplication rec {
     owner = "gramps-project";
     repo = "gramps";
     tag = "v${version}";
-    hash = "sha256-DfKKB+rgMGQ8HTqhCp11UTYLj3Fdd0B0v4a922GJ8L8=";
+    hash = "sha256-Jue5V4pzfd1MaZwEhkGam+MhNjaisio7byMBPgGmiFg=";
   };
 
   patches = [