diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2019-10-18 16:32:00 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2019-10-18 16:32:00 +0000 |
| commit | 0f74f62ee25ac2d21bd67c29b8efc3ad079a72a8 (patch) | |
| tree | bd701e982d896952f4291e4b795c85bb581593b8 /nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix | |
| parent | dae1ae41b3a575e87d411e0cd9daa42a85c5aa89 (diff) | |
| parent | 1c40ee6fc44f7eb474c69ea070a43247a1a2c83c (diff) | |
Merge commit '1c40ee6fc44f7eb474c69ea070a43247a1a2c83c'
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix b/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix index 88f07f0a8a5..ce5a99b1e5f 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/zeronet/default.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ stdenv, fetchFromGitHub, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "zeronet"; - version = "0.6.5"; + version = "0.7.1"; format = "other"; src = fetchFromGitHub { owner = "HelloZeroNet"; repo = "ZeroNet"; rev = "v${version}"; - sha256 = "1b9jg525jq40czyw9xh9ck90fl9rzrdmzl2mzhqqhz23idb60j4a"; + sha256 = "04prgicm0yjh2klcxdgwx1mvlsxxi2bdkzfcvysvixbgq20wjvdk"; }; - propagatedBuildInputs = with python2Packages; [ msgpack gevent ]; - buildPhase = "${python2Packages.python.interpreter} -O -m compileall ."; + propagatedBuildInputs = with python3Packages; [ + gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client + gevent-websocket rencode bitcoinlib maxminddb pyopenssl + ]; + + buildPhase = '' + ${python3Packages.python.interpreter} -O -m compileall . + ''; installPhase = '' mkdir -p $out/share @@ -23,7 +29,7 @@ python2Packages.buildPythonApplication rec { postFixup = '' makeWrapper "$out/share/zeronet.py" "$out/bin/zeronet" \ --set PYTHONPATH "$PYTHONPATH" \ - --set PATH ${python2Packages.python}/bin + --set PATH ${python3Packages.python}/bin ''; meta = with stdenv.lib; { |