python312Packages.python-socketio; onionshare: fix on darwin (#359885)
This commit is contained in:
Peder Bergebakken Sundt
GitHub
commit
cf88138cad
@ -1,182 +0,0 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, meek
|
||||
, obfs4
|
||||
, python3
|
||||
, qt5
|
||||
, snowflake
|
||||
, substituteAll
|
||||
, tor
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onionshare";
|
||||
repo = "onionshare";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-J8Hdriy8eWpHuMCI87a9a/zCR6xafM3A/Tkyom0Ktko=";
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Securely and anonymously send and receive files";
|
||||
longDescription = ''
|
||||
OnionShare is an open source tool for securely and anonymously sending
|
||||
and receiving files using Tor onion services. It works by starting a web
|
||||
server directly on your computer and making it accessible as an
|
||||
unguessable Tor web address that others can load in Tor Browser to
|
||||
download files from you, or upload files to you. It doesn't require
|
||||
setting up a separate server, using a third party file-sharing service,
|
||||
or even logging into an account.
|
||||
|
||||
Unlike services like email, Google Drive, DropBox, WeTransfer, or nearly
|
||||
any other way people typically send files to each other, when you use
|
||||
OnionShare you don't give any companies access to the files that you're
|
||||
sharing. So long as you share the unguessable web address in a secure way
|
||||
(like pasting it in an encrypted messaging app), no one but you and the
|
||||
person you're sharing with can access the files.
|
||||
'';
|
||||
|
||||
homepage = "https://onionshare.org/";
|
||||
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ bbjubjub ];
|
||||
};
|
||||
in
|
||||
rec {
|
||||
onionshare = python3.pkgs.buildPythonApplication {
|
||||
pname = "onionshare-cli";
|
||||
inherit version;
|
||||
src = "${src}/cli";
|
||||
patches = [
|
||||
# hardcode store paths of dependencies
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
inherit tor meek obfs4 snowflake;
|
||||
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=";
|
||||
})
|
||||
];
|
||||
dependencies = with python3.pkgs; [
|
||||
colorama
|
||||
flask
|
||||
flask-compress
|
||||
flask-socketio
|
||||
gevent-websocket
|
||||
packaging
|
||||
psutil
|
||||
pycrypto
|
||||
pynacl
|
||||
pyside6
|
||||
pysocks
|
||||
qrcode
|
||||
requests
|
||||
setuptools
|
||||
stem
|
||||
unidecode
|
||||
waitress
|
||||
werkzeug
|
||||
] ++ requests.optional-dependencies.socks;
|
||||
|
||||
buildInputs = [
|
||||
obfs4
|
||||
tor
|
||||
];
|
||||
|
||||
nativeCheckInputs = with python3.pkgs; [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# Tests use the home directory
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
disabledTests = lib.optionals stdenv.hostPlatform.isLinux [
|
||||
"test_get_tor_paths_linux" # expects /usr instead of /nix/store
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# requires meek-client which is not packaged
|
||||
"test_get_tor_paths_darwin"
|
||||
# on darwin (and only on darwin) onionshare attempts to discover
|
||||
# user's *real* homedir via /etc/passwd, making it more painful
|
||||
# to fake
|
||||
"test_receive_mode_webhook"
|
||||
];
|
||||
|
||||
meta = meta // {
|
||||
mainProgram = "onionshare-cli";
|
||||
};
|
||||
};
|
||||
|
||||
onionshare-gui = python3.pkgs.buildPythonApplication {
|
||||
pname = "onionshare";
|
||||
inherit version;
|
||||
src = "${src}/desktop";
|
||||
patches = [
|
||||
# hardcode store paths of dependencies
|
||||
(substituteAll {
|
||||
src = ./fix-paths-gui.patch;
|
||||
inherit tor meek obfs4 snowflake;
|
||||
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 python3.pkgs; [
|
||||
onionshare
|
||||
pyside6
|
||||
qrcode
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ qt5.qtwayland ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{appdata,applications,icons}
|
||||
cp $src/org.onionshare.OnionShare.desktop $out/share/applications
|
||||
cp $src/org.onionshare.OnionShare.svg $out/share/icons
|
||||
cp $src/org.onionshare.OnionShare.appdata.xml $out/share/appdata
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "onionshare" ];
|
||||
|
||||
meta = meta // {
|
||||
mainProgram = "onionshare";
|
||||
};
|
||||
};
|
||||
}
|
||||
85
pkgs/by-name/on/onionshare-gui/package.nix
Normal file
85
pkgs/by-name/on/onionshare-gui/package.nix
Normal file
@ -0,0 +1,85 @@
|
||||
{
|
||||
python3Packages,
|
||||
onionshare,
|
||||
substituteAll,
|
||||
meek,
|
||||
obfs4,
|
||||
snowflake,
|
||||
tor,
|
||||
fetchpatch,
|
||||
qt5,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "onionshare";
|
||||
inherit (onionshare)
|
||||
src
|
||||
version
|
||||
build-system
|
||||
pythonRelaxDeps
|
||||
;
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/desktop";
|
||||
|
||||
patches = [
|
||||
# hardcode store paths of dependencies
|
||||
(substituteAll {
|
||||
src = ./fix-paths-gui.patch;
|
||||
inherit
|
||||
meek
|
||||
obfs4
|
||||
snowflake
|
||||
tor
|
||||
;
|
||||
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; [
|
||||
onionshare
|
||||
pyside6
|
||||
python-gnupg
|
||||
qrcode
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||
|
||||
buildInputs = [ qt5.qtwayland ];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{appdata,applications,icons}
|
||||
cp $src/desktop/org.onionshare.OnionShare.desktop $out/share/applications
|
||||
cp $src/desktop/org.onionshare.OnionShare.svg $out/share/icons
|
||||
cp $src/desktop/org.onionshare.OnionShare.appdata.xml $out/share/appdata
|
||||
'';
|
||||
|
||||
dontWrapQtApps = true;
|
||||
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "onionshare" ];
|
||||
|
||||
meta = onionshare.meta // {
|
||||
mainProgram = "onionshare";
|
||||
};
|
||||
}
|
||||
155
pkgs/by-name/on/onionshare/package.nix
Normal file
155
pkgs/by-name/on/onionshare/package.nix
Normal file
@ -0,0 +1,155 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
python3Packages,
|
||||
fetchFromGitHub,
|
||||
|
||||
# patches
|
||||
substituteAll,
|
||||
meek,
|
||||
obfs4,
|
||||
snowflake,
|
||||
tor,
|
||||
|
||||
fetchpatch,
|
||||
versionCheckHook,
|
||||
gitUpdater,
|
||||
onionshare-gui,
|
||||
}:
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "onionshare-cli";
|
||||
version = "2.6.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onionshare";
|
||||
repo = "onionshare";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-J8Hdriy8eWpHuMCI87a9a/zCR6xafM3A/Tkyom0Ktko=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/cli";
|
||||
|
||||
patches = [
|
||||
# hardcode store paths of dependencies
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
inherit
|
||||
meek
|
||||
obfs4
|
||||
snowflake
|
||||
tor
|
||||
;
|
||||
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; [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
dependencies =
|
||||
with python3Packages;
|
||||
[
|
||||
cffi
|
||||
click
|
||||
colorama
|
||||
cython
|
||||
eventlet
|
||||
flask
|
||||
flask-compress
|
||||
flask-socketio
|
||||
gevent
|
||||
gevent-websocket
|
||||
packaging
|
||||
psutil
|
||||
pynacl
|
||||
pysocks
|
||||
qrcode
|
||||
requests
|
||||
setuptools
|
||||
stem
|
||||
unidecode
|
||||
urllib3
|
||||
waitress
|
||||
werkzeug
|
||||
wheel
|
||||
]
|
||||
++ requests.optional-dependencies.socks;
|
||||
|
||||
buildInputs = [
|
||||
obfs4
|
||||
tor
|
||||
];
|
||||
|
||||
nativeCheckInputs =
|
||||
[
|
||||
versionCheckHook
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
pytestCheckHook
|
||||
]);
|
||||
|
||||
preCheck = ''
|
||||
# Tests use the home directory
|
||||
export HOME="$(mktemp -d)"
|
||||
'';
|
||||
|
||||
disabledTests =
|
||||
lib.optionals stdenv.hostPlatform.isLinux [
|
||||
"test_get_tor_paths_linux" # expects /usr instead of /nix/store
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# requires meek-client which is not packaged
|
||||
"test_get_tor_paths_darwin"
|
||||
# on darwin (and only on darwin) onionshare attempts to discover
|
||||
# user's *real* homedir via /etc/passwd, making it more painful
|
||||
# to fake
|
||||
"test_receive_mode_webhook"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
passthru = {
|
||||
updateScript = gitUpdater { rev-prefix = "v"; };
|
||||
tests = {
|
||||
inherit onionshare-gui;
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Securely and anonymously send and receive files";
|
||||
longDescription = ''
|
||||
OnionShare is an open source tool for securely and anonymously sending
|
||||
and receiving files using Tor onion services. It works by starting a web
|
||||
server directly on your computer and making it accessible as an
|
||||
unguessable Tor web address that others can load in Tor Browser to
|
||||
download files from you, or upload files to you. It doesn't require
|
||||
setting up a separate server, using a third party file-sharing service,
|
||||
or even logging into an account.
|
||||
|
||||
Unlike services like email, Google Drive, DropBox, WeTransfer, or nearly
|
||||
any other way people typically send files to each other, when you use
|
||||
OnionShare you don't give any companies access to the files that you're
|
||||
sharing. So long as you share the unguessable web address in a secure way
|
||||
(like pasting it in an encrypted messaging app), no one but you and the
|
||||
person you're sharing with can access the files.
|
||||
'';
|
||||
homepage = "https://onionshare.org/";
|
||||
changelog = "https://github.com/onionshare/onionshare/releases/tag/v${version}";
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ bbjubjub ];
|
||||
mainProgram = "onionshare-cli";
|
||||
};
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
|
||||
# build-system
|
||||
setuptools,
|
||||
@ -29,8 +29,6 @@ buildPythonPackage rec {
|
||||
version = "5.11.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "miguelgrinberg";
|
||||
repo = "python-socketio";
|
||||
@ -38,9 +36,9 @@ buildPythonPackage rec {
|
||||
hash = "sha256-iWe9IwUR+nq9SAmHzFZYUJpVOOEbc1ZdiMAjaBjQrVs=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools ];
|
||||
build-system = [ setuptools ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
bidict
|
||||
python-engineio
|
||||
];
|
||||
@ -62,7 +60,15 @@ buildPythonPackage rec {
|
||||
|
||||
pythonImportsCheck = [ "socketio" ];
|
||||
|
||||
meta = with lib; {
|
||||
disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
# Use fixed ports which leads to failures when building concurrently
|
||||
"tests/async/test_admin.py"
|
||||
"tests/common/test_admin.py"
|
||||
];
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
meta = {
|
||||
description = "Python Socket.IO server and client";
|
||||
longDescription = ''
|
||||
Socket.IO is a lightweight transport protocol that enables real-time
|
||||
@ -70,7 +76,7 @@ buildPythonPackage rec {
|
||||
'';
|
||||
homepage = "https://github.com/miguelgrinberg/python-socketio/";
|
||||
changelog = "https://github.com/miguelgrinberg/python-socketio/blob/v${version}/CHANGES.md";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ mic92 ];
|
||||
license = with lib.licenses; [ mit ];
|
||||
maintainers = with lib.maintainers; [ mic92 ];
|
||||
};
|
||||
}
|
||||
|
||||
@ -15167,8 +15167,6 @@ with pkgs;
|
||||
|
||||
omegat = callPackage ../applications/misc/omegat.nix { };
|
||||
|
||||
inherit (callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui;
|
||||
|
||||
openambit = qt5.callPackage ../applications/misc/openambit { };
|
||||
|
||||
openbox-menu = callPackage ../applications/misc/openbox-menu {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user