public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68231 from Chiiruno/dev/zeronet

Browse Source 
Update: Zeronet, Init: pythonPackages: merkletools
This commit is contained in:
Jörg Thalheim 2019-10-02 10:57:57 +01:00 committed by GitHub
commit d97e30068c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/networking/p2p/zeronet/default.nix
View File

@ -1,19 +1,25 @@
{ stdenv, fetchFromGitHub, python2Packages }: { stdenv, fetchFromGitHub, python3Packages }:
python2Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "zeronet"; pname = "zeronet";
version = "0.6.5"; version = "0.7.1";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "HelloZeroNet"; owner = "HelloZeroNet";
repo = "ZeroNet"; repo = "ZeroNet";
rev = "v${version}"; rev = "v${version}";
sha256 = "1b9jg525jq40czyw9xh9ck90fl9rzrdmzl2mzhqqhz23idb60j4a"; sha256 = "04prgicm0yjh2klcxdgwx1mvlsxxi2bdkzfcvysvixbgq20wjvdk";
}; };
propagatedBuildInputs = with python2Packages; [ msgpack gevent ]; propagatedBuildInputs = with python3Packages; [
buildPhase = "${python2Packages.python.interpreter} -O -m compileall ."; gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket_client
gevent-websocket rencode bitcoinlib maxminddb pyopenssl
];
buildPhase = ''
${python3Packages.python.interpreter} -O -m compileall .
'';
installPhase = '' installPhase = ''
mkdir -p $out/share mkdir -p $out/share
@ -23,7 +29,7 @@ python2Packages.buildPythonApplication rec {
postFixup = '' postFixup = ''
makeWrapper "$out/share/zeronet.py" "$out/bin/zeronet" \ makeWrapper "$out/share/zeronet.py" "$out/bin/zeronet" \
--set PYTHONPATH "$PYTHONPATH" \ --set PYTHONPATH "$PYTHONPATH" \
--set PATH ${python2Packages.python}/bin --set PATH ${python3Packages.python}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

20
pkgs/development/python-modules/merkletools/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ lib, buildPythonPackage, fetchPypi, pysha3 }:
buildPythonPackage rec {
pname = "merkletools";
version = "1.0.3";
src = fetchPypi {
inherit pname version;
sha256 = "0pdik5sil0xcrwdcgdfy86c5qcfrz24r0gfc8m8bxa0i7h7x2v9l";
};
propagatedBuildInputs = [ pysha3 ];
meta = with lib; {
description = "Python tools for creating Merkle trees, generating Merkle proofs, and verification of Merkle proofs";
homepage = "https://github.com/Tierion/pymerkletools";
license = licenses.mit;
maintainers = with maintainers; [ chiiruno ];
};
}

2
pkgs/top-level/python-packages.nix
View File

@ -3895,6 +3895,8 @@ in {
pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; pymysqlsa = callPackage ../development/python-modules/pymysqlsa { };
merkletools = callPackage ../development/python-modules/merkletools { };
monosat = disabledIf (!isPy3k) (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; }); monosat = disabledIf (!isPy3k) (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; });
monotonic = callPackage ../development/python-modules/monotonic { }; monotonic = callPackage ../development/python-modules/monotonic { };