From ab86fb8454efe8b27a563cc1ede3aed5dec9cabb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 13 Jun 2025 19:29:26 -0700
Subject: [PATCH] onionshare: 2.6.2 -> 2.6.3

Diff: https://github.com/onionshare/onionshare/compare/refs/tags/v2.6.2...refs/tags/v2.6.3

Changelog: https://github.com/onionshare/onionshare/releases/tag/v2.6.3
---
 pkgs/by-name/on/onionshare-gui/package.nix | 17 -----------------
 pkgs/by-name/on/onionshare/package.nix     | 16 +++-------------
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/on/onionshare-gui/package.nix b/pkgs/by-name/on/onionshare-gui/package.nix
index 7ec4761844a6..74d7c62fb679 100644
--- a/pkgs/by-name/on/onionshare-gui/package.nix
+++ b/pkgs/by-name/on/onionshare-gui/package.nix
@@ -6,7 +6,6 @@
   obfs4,
   snowflake,
   tor,
-  fetchpatch,
   qt5,
 }:
 python3Packages.buildPythonApplication rec {
@@ -32,22 +31,6 @@ python3Packages.buildPythonApplication rec {
         ;
       inherit (tor) geoip;
     })
-
-    # https://github.com/onionshare/onionshare/pull/1903
-    (fetchpatch {
-      url = "https://github.com/onionshare/onionshare/pull/1903/commits/f20db8fcbd18e51b58814ae8f98f3a7502b4f456.patch";
-      stripLen = 1;
-      hash = "sha256-wfIjdPhdUYAvbK5XyE1o2OtFOlJRj0X5mh7QQRjdyP0=";
-    })
-
-    # Remove distutils for Python 3.12 compatibility
-    # https://github.com/onionshare/onionshare/pull/1907
-    (fetchpatch {
-      url = "https://github.com/onionshare/onionshare/commit/1fb1a470df20d8a7576c8cf51213e5928528d59a.patch";
-      includes = [ "onionshare/update_checker.py" ];
-      stripLen = 1;
-      hash = "sha256-mRRj9cALZVHw86CgU17sp9EglKhkRRcGfROyQpsXVfU=";
-    })
   ];
 
   dependencies = with python3Packages; [
diff --git a/pkgs/by-name/on/onionshare/package.nix b/pkgs/by-name/on/onionshare/package.nix
index 640caf9ed2a1..7d16901ec98c 100644
--- a/pkgs/by-name/on/onionshare/package.nix
+++ b/pkgs/by-name/on/onionshare/package.nix
@@ -11,7 +11,6 @@
   snowflake,
   tor,
 
-  fetchpatch,
   versionCheckHook,
   gitUpdater,
   onionshare-gui,
@@ -19,14 +18,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "onionshare-cli";
-  version = "2.6.2";
+  version = "2.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "onionshare";
     repo = "onionshare";
     tag = "v${version}";
-    hash = "sha256-J8Hdriy8eWpHuMCI87a9a/zCR6xafM3A/Tkyom0Ktko=";
+    hash = "sha256-DY5rSHkmiqLIa49gcbq7VfcMM1AMFTJ5FPQtS2kR2Zs=";
   };
 
   sourceRoot = "${src.name}/cli";
@@ -42,15 +41,6 @@ python3Packages.buildPythonApplication rec {
         ;
       inherit (tor) geoip;
     })
-
-    # Remove distutils for Python 3.12 compatibility
-    # https://github.com/onionshare/onionshare/pull/1907
-    (fetchpatch {
-      url = "https://github.com/onionshare/onionshare/commit/1fb1a470df20d8a7576c8cf51213e5928528d59a.patch";
-      includes = [ "onionshare_cli/onion.py" ];
-      stripLen = 1;
-      hash = "sha256-4XkqaEhMhvj6PyMssnLfXRazdP4k+c9mMDveho7pWg8=";
-    })
   ];
 
   build-system = with python3Packages; [
@@ -143,7 +133,7 @@ python3Packages.buildPythonApplication rec {
       person you're sharing with can access the files.
     '';
     homepage = "https://onionshare.org/";
-    changelog = "https://github.com/onionshare/onionshare/releases/tag/v${version}";
+    changelog = "https://github.com/onionshare/onionshare/releases/tag/${src.tag}";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ bbjubjub ];
     mainProgram = "onionshare-cli";