Robert Schütz
2025-06-13 19:34:34 -07:00
parent 48145066a9
commit ab86fb8454
2 changed files with 3 additions and 30 deletions
@@ -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; [
+3 -13
View File
@@ -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";