pyrox.dev
onionshare: 2.5 -> 2.6
pkgs
applications
networking
onionshare
+2
-2
pkgs/applications/networking/onionshare/default.nix
+2
-2
pkgs/applications/networking/onionshare/default.nix
···
26
}:
27
28
let
29
+
version = "2.6";
30
src = fetchFromGitHub {
31
owner = "onionshare";
32
repo = "onionshare";
33
rev = "v${version}";
34
+
sha256 = "sha256-LA7XlzoCXUiG/9subTddAd22336wO9sOHCIBlQK4Ga4=";
35
};
36
meta = with lib; {
37
description = "Securely and anonymously send and receive files";
+7
-7
pkgs/applications/networking/onionshare/fix-paths-gui.patch
+7
-7
pkgs/applications/networking/onionshare/fix-paths-gui.patch
···
1
--- a/onionshare/gui_common.py
2
+++ b/onionshare/gui_common.py
3
-
@@ -410,52 +410,12 @@ class GuiCommon:
4
}
5
6
def get_tor_paths(self):
···
29
-
30
- if self.common.platform == "Windows":
31
- base_path = self.get_resource_path("tor")
32
-
- tor_path = os.path.join(base_path, "Tor", "tor.exe")
33
-
- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
34
-
- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
35
-
- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
36
-
- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
37
-
- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
38
- elif self.common.platform == "Darwin":
39
- base_path = self.get_resource_path("tor")
40
- tor_path = os.path.join(base_path, "tor")
···
1
--- a/onionshare/gui_common.py
2
+++ b/onionshare/gui_common.py
3
+
@@ -482,52 +482,12 @@ class GuiCommon:
4
}
5
6
def get_tor_paths(self):
···
29
-
30
- if self.common.platform == "Windows":
31
- base_path = self.get_resource_path("tor")
32
+
- tor_path = os.path.join(base_path, "tor.exe")
33
+
- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")
34
+
- snowflake_file_path = os.path.join(base_path, "snowflake-client.exe")
35
+
- meek_client_file_path = os.path.join(base_path, "meek-client.exe")
36
+
- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
37
+
- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
38
- elif self.common.platform == "Darwin":
39
- base_path = self.get_resource_path("tor")
40
- tor_path = os.path.join(base_path, "tor")
+14
-8
pkgs/applications/networking/onionshare/fix-paths.patch
+14
-8
pkgs/applications/networking/onionshare/fix-paths.patch
···
1
--- a/onionshare_cli/common.py
2
+++ b/onionshare_cli/common.py
3
-
@@ -318,67 +318,12 @@ class Common:
4
return path
5
6
def get_tor_paths(self):
···
18
- # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package
19
- base_path = self.get_resource_path("tor")
20
- base_path = base_path.replace("onionshare_cli", "onionshare")
21
-
- tor_path = os.path.join(base_path, "Tor", "tor.exe")
22
-
23
- # If tor.exe isn't there, mayber we're running from the source tree
24
- if not os.path.exists(tor_path):
0
0
0
25
- base_path = os.path.join(os.getcwd(), "onionshare", "resources", "tor")
26
-
27
-
- tor_path = os.path.join(base_path, "Tor", "tor.exe")
28
- if not os.path.exists(tor_path):
0
0
0
29
- raise CannotFindTor()
30
-
31
-
- obfs4proxy_file_path = os.path.join(base_path, "Tor", "obfs4proxy.exe")
32
-
- snowflake_file_path = os.path.join(base_path, "Tor", "snowflake-client.exe")
33
-
- meek_client_file_path = os.path.join(base_path, "Tor", "meek-client.exe")
34
-
- tor_geo_ip_file_path = os.path.join(base_path, "Data", "Tor", "geoip")
35
-
- tor_geo_ipv6_file_path = os.path.join(base_path, "Data", "Tor", "geoip6")
36
-
37
- elif self.platform == "Darwin":
38
- # Let's see if we have tor binaries in the onionshare GUI package
···
1
--- a/onionshare_cli/common.py
2
+++ b/onionshare_cli/common.py
3
+
@@ -318,73 +318,12 @@ class Common:
4
return path
5
6
def get_tor_paths(self):
···
18
- # In Windows, the Tor binaries are in the onionshare package, not the onionshare_cli package
19
- base_path = self.get_resource_path("tor")
20
- base_path = base_path.replace("onionshare_cli", "onionshare")
21
+
- tor_path = os.path.join(base_path, "tor.exe")
22
-
23
- # If tor.exe isn't there, mayber we're running from the source tree
24
- if not os.path.exists(tor_path):
25
+
- self.log(
26
+
- "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}"
27
+
- )
28
- base_path = os.path.join(os.getcwd(), "onionshare", "resources", "tor")
29
-
30
+
- tor_path = os.path.join(base_path, "tor.exe")
31
- if not os.path.exists(tor_path):
32
+
- self.log(
33
+
- "Common", "get_tor_paths", f"Cannot find tor.exe at {tor_path}"
34
+
- )
35
- raise CannotFindTor()
36
-
37
+
- obfs4proxy_file_path = os.path.join(base_path, "obfs4proxy.exe")
38
+
- snowflake_file_path = os.path.join(base_path, "snowflake-client.exe")
39
+
- meek_client_file_path = os.path.join(base_path, "meek-client.exe")
40
+
- tor_geo_ip_file_path = os.path.join(base_path, "geoip")
41
+
- tor_geo_ipv6_file_path = os.path.join(base_path, "geoip6")
42
-
43
- elif self.platform == "Darwin":
44
- # Let's see if we have tor binaries in the onionshare GUI package