mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-21 12:59:04 +02:00
onionshare: 2.6 -> 2.6.1
This commit is contained in:
parent
3c833febee
commit
4d6ea7fc8a
|
@ -1,39 +1,40 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, buildPythonApplication
|
, buildPythonApplication
|
||||||
, substituteAll
|
, cepa
|
||||||
, fetchFromGitHub
|
|
||||||
, isPy3k
|
|
||||||
, colorama
|
, colorama
|
||||||
|
, fetchFromGitHub
|
||||||
, flask
|
, flask
|
||||||
|
, flask-compress
|
||||||
, flask-httpauth
|
, flask-httpauth
|
||||||
, flask-socketio
|
, flask-socketio
|
||||||
, gevent-socketio
|
, gevent-socketio
|
||||||
, gevent-websocket
|
, gevent-websocket
|
||||||
, cepa
|
, obfs4
|
||||||
, psutil
|
, psutil
|
||||||
, pyqt5
|
|
||||||
, pycrypto
|
, pycrypto
|
||||||
, pynacl
|
, pynacl
|
||||||
, pyside2
|
, pyqt5
|
||||||
|
, pyside6
|
||||||
, pysocks
|
, pysocks
|
||||||
, pytestCheckHook
|
, pytestCheckHook
|
||||||
, qrcode
|
, qrcode
|
||||||
, qt5
|
, qt5
|
||||||
, requests
|
, requests
|
||||||
, unidecode
|
|
||||||
, tor
|
|
||||||
, obfs4
|
|
||||||
, snowflake
|
, snowflake
|
||||||
|
, substituteAll
|
||||||
|
, tor
|
||||||
|
, unidecode
|
||||||
|
, waitress
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "2.6";
|
version = "2.6.1";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "onionshare";
|
owner = "onionshare";
|
||||||
repo = "onionshare";
|
repo = "onionshare";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-LA7XlzoCXUiG/9subTddAd22336wO9sOHCIBlQK4Ga4=";
|
sha256 = "sha256-LR3Ao4Q8kEDwrFV+gYdMSEeYF4hDtEa1rJgvRRrJMwc=";
|
||||||
};
|
};
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Securely and anonymously send and receive files";
|
description = "Securely and anonymously send and receive files";
|
||||||
|
@ -79,23 +80,27 @@ rec {
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
|
cepa
|
||||||
colorama
|
colorama
|
||||||
flask
|
flask
|
||||||
|
flask-compress
|
||||||
flask-httpauth
|
flask-httpauth
|
||||||
flask-socketio
|
flask-socketio
|
||||||
gevent-socketio
|
gevent-socketio
|
||||||
gevent-websocket
|
gevent-websocket
|
||||||
cepa
|
|
||||||
psutil
|
psutil
|
||||||
pycrypto
|
pycrypto
|
||||||
pynacl
|
pynacl
|
||||||
|
pyside6
|
||||||
|
qrcode
|
||||||
requests
|
requests
|
||||||
unidecode
|
unidecode
|
||||||
|
waitress
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
tor
|
|
||||||
obfs4
|
obfs4
|
||||||
|
tor
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeCheckInputs = [
|
nativeCheckInputs = [
|
||||||
|
@ -107,9 +112,11 @@ rec {
|
||||||
export HOME="$(mktemp -d)"
|
export HOME="$(mktemp -d)"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
disabledTests = [
|
disabledTests = lib.optionals stdenv.isLinux [
|
||||||
"test_get_tor_paths_linux" # expects /usr instead of /nix/store
|
"test_get_tor_paths_linux" # expects /usr instead of /nix/store
|
||||||
] ++ lib.optionals stdenv.isDarwin [
|
] ++ lib.optionals stdenv.isDarwin [
|
||||||
|
# requires meek-client which is not packaged
|
||||||
|
"test_get_tor_paths_darwin"
|
||||||
# on darwin (and only on darwin) onionshare attempts to discover
|
# on darwin (and only on darwin) onionshare attempts to discover
|
||||||
# user's *real* homedir via /etc/passwd, making it more painful
|
# user's *real* homedir via /etc/passwd, making it more painful
|
||||||
# to fake
|
# to fake
|
||||||
|
@ -128,16 +135,15 @@ rec {
|
||||||
inherit tor meek obfs4 snowflake;
|
inherit tor meek obfs4 snowflake;
|
||||||
inherit (tor) geoip;
|
inherit (tor) geoip;
|
||||||
})
|
})
|
||||||
./fix-qrcode-gui.patch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
onionshare
|
onionshare
|
||||||
pyqt5
|
|
||||||
pyside2
|
|
||||||
psutil
|
psutil
|
||||||
qrcode
|
pyqt5
|
||||||
|
pyside6
|
||||||
pysocks
|
pysocks
|
||||||
|
qrcode
|
||||||
];
|
];
|
||||||
|
|
||||||
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
nativeBuildInputs = [ qt5.wrapQtAppsHook ];
|
||||||
|
|
|
@ -1,14 +0,0 @@
|
||||||
diff --git desktop/onionshare/widgets.py desktop/onionshare/widgets.py
|
|
||||||
index 64a07703..bca974fb 100644
|
|
||||||
--- desktop/onionshare/widgets.py
|
|
||||||
+++ desktop/onionshare/widgets.py
|
|
||||||
@@ -101,7 +101,7 @@ class Image(qrcode.image.base.BaseImage):
|
|
||||||
A custom Image class, for use with the QR Code pixmap.
|
|
||||||
"""
|
|
||||||
|
|
||||||
- def __init__(self, border, width, box_size):
|
|
||||||
+ def __init__(self, border, width, box_size, *args, **kargs):
|
|
||||||
self.border = border
|
|
||||||
self.width = width
|
|
||||||
self.box_size = box_size
|
|
||||||
|
|
Loading…
Reference in a new issue