diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-10-02 10:57:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 10:57:57 +0100 |
| commit | d97e30068c1f7413b649af43e9df75b182cddd1d (patch) | |
| tree | 4b3ecc8dab33b51f279835a469f9f1a7a49b473b /pkgs/applications | |
| parent | 50675916d11a7f2155acb05151c78d5f06f6bb6f (diff) | |
| parent | c4451da8f8844b4ed32f50c7a6dc4c8f10da68b8 (diff) | |
| download | nixlib-d97e30068c1f7413b649af43e9df75b182cddd1d.tar nixlib-d97e30068c1f7413b649af43e9df75b182cddd1d.tar.gz nixlib-d97e30068c1f7413b649af43e9df75b182cddd1d.tar.bz2 nixlib-d97e30068c1f7413b649af43e9df75b182cddd1d.tar.lz nixlib-d97e30068c1f7413b649af43e9df75b182cddd1d.tar.xz nixlib-d97e30068c1f7413b649af43e9df75b182cddd1d.tar.zst nixlib-d97e30068c1f7413b649af43e9df75b182cddd1d.zip | |
Merge pull request #68231 from Chiiruno/dev/zeronet
Update: Zeronet, Init: pythonPackages: merkletools
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/p2p/zeronet/default.nix | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/applications/networking/p2p/zeronet/default.nix b/pkgs/applications/networking/p2p/zeronet/default.nix index 88f07f0a8a50..ce5a99b1e5fc 100644 --- a/pkgs/applications/networking/p2p/zeronet/default.nix +++ b/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; { |