Unverified Commit 4b02f74d authored by Stanisław Pitucha's avatar Stanisław Pitucha Committed by GitHub
Browse files

Merge pull request #195355 from lourkeur/onionshare 

onionshare: 2.5 -> 2.6
parents 49126873 f0957986

pkgs/applications/networking/onionshare/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ 
}:



let

  version = "2.5";

  version = "2.6";

  src = fetchFromGitHub {

    owner = "onionshare";

    repo = "onionshare";

    rev = "v${version}";

    sha256 = "xCAM+tjjyDg/gqAXr4YNPhM8R3n9r895jktisAGlpZo=";

    sha256 = "sha256-LA7XlzoCXUiG/9subTddAd22336wO9sOHCIBlQK4Ga4=";

  };

  meta = with lib; {

    description = "Securely and anonymously send and receive files";

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

+7 −7
Original line number Diff line number Diff line 
--- a/onionshare/gui_common.py

+++ b/onionshare/gui_common.py

@@ -410,52 +410,12 @@ class GuiCommon:

@@ -482,52 +482,12 @@ class GuiCommon:

         }

 

     def get_tor_paths(self):
@@ -29,12 +29,12 @@ 
-

-        if self.common.platform == "Windows":

-            base_path = self.get_resource_path("tor")

-            tor_path = os.path.join(base_path, "Tor", "tor.exe")

-            obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")

-            snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")

-            meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")

-            tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")

-            tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")

-            tor_path = os.path.join(base_path, "tor.exe")

-            obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")

-            snowflake_file_path = os.path.join(base_path, "snowflake-client.exe")

-            meek_client_file_path = os.path.join(base_path, "meek-client.exe")

-            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 == "Darwin":

-            base_path = self.get_resource_path("tor")

-            tor_path = os.path.join(base_path, "tor")

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

+14 −8
Original line number Diff line number Diff line 
--- a/onionshare_cli/common.py

+++ b/onionshare_cli/common.py

@@ -318,67 +318,12 @@ class Common:

@@ -318,73 +318,12 @@ class Common:

         return path

 

     def get_tor_paths(self):
@@ -18,21 +18,27 @@ 
-            # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package

-            base_path = self.get_resource_path("tor")

-            base_path = base_path.replace("onionshare_cli", "onionshare")

-            tor_path = os.path.join(base_path, "Tor", "tor.exe")

-            tor_path = os.path.join(base_path, "tor.exe")

-

-            # If tor.exe isn't there, mayber we're running from the source tree

-            if not os.path.exists(tor_path):

-                self.log(

-                    "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}"

-                )

-                base_path = os.path.join(os.getcwd(), "onionshare", "resources", "tor")

-

-                tor_path = os.path.join(base_path, "Tor", "tor.exe")

-                tor_path = os.path.join(base_path, "tor.exe")

-                if not os.path.exists(tor_path):

-                    self.log(

-                        "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}"

-                    )

-                    raise CannotFindTor()

-

-            obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")

-            snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")

-            meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")

-            tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")

-            tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")

-            obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")

-            snowflake_file_path = os.path.join(base_path, "snowflake-client.exe")

-            meek_client_file_path = os.path.join(base_path, "meek-client.exe")

-            tor_geo_ip_file_path = os.path.join(base_path, "geoip")

-            tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")

-

-        elif self.platform == "Darwin":

-            # Let's see if we have tor binaries in the onionshare GUI package