Merge pull request #125339 from lourkeur/update/onionshare

onionshare: 2.3.1 -> 2.3.2

pkgs/applications/networking/onionshare/default.nix

@@ -4,6 +4,7 @@
   substituteAll,
   fetchFromGitHub,
   isPy3k,
+  colorama,
   flask,
   flask-httpauth,
   flask-socketio,
@@ -22,12 +23,12 @@
 }:
 
 let
-  version = "2.3.1";
+  version = "2.3.2";
   src = fetchFromGitHub {
     owner = "micahflee";
     repo = "onionshare";
     rev = "v${version}";
-    sha256 = "sha256-H09x3OF6l1HLHukGPvV2rZUjW9fxeKKMZkKbY9a2m9I=";
+    sha256 = "sha256-mzLDvvpO82iGDnzY42wx1KCNmAxUgVhpaDVprtb+YOI=";
   };
   meta = with lib; {
     description = "Securely and anonymously send and receive files";
@@ -69,6 +70,7 @@ in rec {
     ];
     disable = !isPy3k;
     propagatedBuildInputs = [
+      colorama
       flask
       flask-httpauth
       flask-socketio

pkgs/applications/networking/onionshare/fix-paths-gui.patch

@@ -1,7 +1,6 @@
-
 --- a/onionshare/gui_common.py
 +++ b/onionshare/gui_common.py
-@@ -376,29 +376,10 @@ class GuiCommon:
+@@ -391,29 +391,10 @@ class GuiCommon:
          }
  
      def get_tor_paths(self):
@@ -20,7 +19,7 @@
 -        elif self.common.platform == "Darwin":
 -            base_path = self.get_resource_path("tor")
 -            tor_path = os.path.join(base_path, "tor")
--            obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")
+-            obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy")
 -            tor_geo_ip_file_path = os.path.join(base_path, "geoip")
 -            tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
 -        elif self.common.platform == "BSD":

pkgs/applications/networking/onionshare/fix-paths.patch

@@ -1,8 +1,8 @@
 --- a/onionshare_cli/common.py
 +++ b/onionshare_cli/common.py
-@@ -86,33 +86,10 @@ class Common:
+@@ -308,33 +308,10 @@ class Common:
          return path
- 
+
      def get_tor_paths(self):
 -        if self.platform == "Linux":
 -            tor_path = shutil.which("tor")
@@ -35,6 +35,7 @@
 +        tor_geo_ip_file_path = "@geoip@/share/tor/geoip"
 +        tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6"
 +        obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy"
- 
+
          return (
              tor_path,
+