From da07e52ffa908dcfc77535b49bf2c08eed2af2cd Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Fri, 29 Sep 2023 05:17:32 +0200
Subject: [PATCH 1/2] hydrus: 544 -> 549

Diff: https://github.com/hydrusnetwork/hydrus/compare/refs/tags/v544...v549

Drops the running from source patch, since upstream is doing a better check
---
 .../graphics/hydrus/0001-inform-nixpkgs.patch  | 18 ------------------
 pkgs/applications/graphics/hydrus/default.nix  |  9 ++-------
 2 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch

diff --git a/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch b/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch
deleted file mode 100644
index e7200814eb05..000000000000
--- a/pkgs/applications/graphics/hydrus/0001-inform-nixpkgs.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/hydrus/core/HydrusConstants.py b/hydrus/core/HydrusConstants.py
-index 809338ef..9125928f 100644
---- a/hydrus/core/HydrusConstants.py
-+++ b/hydrus/core/HydrusConstants.py
-@@ -59,12 +59,7 @@ elif PLATFORM_HAIKU:
- RUNNING_FROM_SOURCE = sys.argv[0].endswith( '.py' ) or sys.argv[0].endswith( '.pyw' )
- RUNNING_FROM_MACOS_APP = os.path.exists( os.path.join( BASE_DIR, 'running_from_app' ) )
- 
--if RUNNING_FROM_SOURCE:
--    NICE_RUNNING_AS_STRING = 'from source'
--elif RUNNING_FROM_FROZEN_BUILD:
--    NICE_RUNNING_AS_STRING = 'from frozen build'
--elif RUNNING_FROM_MACOS_APP:
--    NICE_RUNNING_AS_STRING = 'from App'
-+NICE_RUNNING_AS_STRING = "from nixpkgs (source)"
- 
- BIN_DIR = os.path.join( BASE_DIR, 'bin' )
- HELP_DIR = os.path.join( BASE_DIR, 'help' )
diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index 968f60ba8096..188564cd69ce 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -12,21 +12,16 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "hydrus";
-  version = "544";
+  version = "549";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
     rev = "refs/tags/v${version}";
-    hash = "sha256-e3VvkdJAQx5heKDJ1Ms6XpXrXWdzv48f8yu0DHfPy1A=";
+    hash = "sha256-y3WFQhPE8H0198Xu3Dn9YAqaX8YvFJcdt90tebTg7qw=";
   };
 
-  patches = [
-    # Nixpkgs specific, can be removed if upstream makes a more reasonable check
-    ./0001-inform-nixpkgs.patch
-  ];
-
   nativeBuildInputs = [
     wrapQtAppsHook
     python3Packages.mkdocs-material

From 3010b1873b8795a4c95625118b96caac8fb8434f Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Sat, 28 Oct 2023 23:43:50 +0200
Subject: [PATCH 2/2] hydrus: clean up checkPhase and doc output

---
 pkgs/applications/graphics/hydrus/default.nix | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix
index 188564cd69ce..91f38633e6dd 100644
--- a/pkgs/applications/graphics/hydrus/default.nix
+++ b/pkgs/applications/graphics/hydrus/default.nix
@@ -70,31 +70,35 @@ python3Packages.buildPythonPackage rec {
 
   # most tests are failing, presumably because we are not using test.py
   checkPhase = ''
+    runHook preCheck
+
     nosetests $src/hydrus/test  \
-    -e TestClientAPI \
-    -e TestClientConstants \
-    -e TestClientDaemons \
-    -e TestClientData \
-    -e TestClientDB \
-    -e TestClientDBDuplicates \
-    -e TestClientDBTags \
-    -e TestClientImageHandling \
-    -e TestClientImportOptions \
-    -e TestClientListBoxes \
-    -e TestClientMigration \
-    -e TestClientNetworking \
-    -e TestClientTags \
-    -e TestClientThreading \
-    -e TestDialogs \
-    -e TestFunctions \
-    -e TestHydrusNetwork \
-    -e TestHydrusNATPunch \
-    -e TestHydrusSerialisable \
-    -e TestHydrusServer \
-    -e TestHydrusSessions \
-    -e TestServer \
-    -e TestClientMetadataMigration \
-    -e TestClientFileStorage \
+      -e TestClientAPI \
+      -e TestClientConstants \
+      -e TestClientDaemons \
+      -e TestClientData \
+      -e TestClientDB \
+      -e TestClientDBDuplicates \
+      -e TestClientDBTags \
+      -e TestClientImageHandling \
+      -e TestClientImportOptions \
+      -e TestClientListBoxes \
+      -e TestClientMigration \
+      -e TestClientNetworking \
+      -e TestClientTags \
+      -e TestClientThreading \
+      -e TestDialogs \
+      -e TestFunctions \
+      -e TestHydrusNetwork \
+      -e TestHydrusNATPunch \
+      -e TestHydrusSerialisable \
+      -e TestHydrusServer \
+      -e TestHydrusSessions \
+      -e TestServer \
+      -e TestClientMetadataMigration \
+      -e TestClientFileStorage \
+
+    runHook postCheck
   '';
 
   outputs = [ "out" "doc" ];
@@ -107,7 +111,8 @@ python3Packages.buildPythonPackage rec {
     chmod -x $out/${python3Packages.python.sitePackages}/static/*.{png,svg,ico}
     # Build docs
     mkdocs build -d help
-    mv help $out/doc/
+    mkdir -p $doc/share/doc
+    mv help $doc/share/doc/hydrus
 
     # install the hydrus binaries
     mkdir -p $out/bin