chia: 1.6.0 -> 1.6.2
This commit is contained in:
parent
87208cc09e
commit
301620319b
|
@ -6,21 +6,16 @@
|
||||||
|
|
||||||
let chia = python3Packages.buildPythonApplication rec {
|
let chia = python3Packages.buildPythonApplication rec {
|
||||||
pname = "chia";
|
pname = "chia";
|
||||||
version = "1.6.0";
|
version = "1.6.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "Chia-Network";
|
owner = "Chia-Network";
|
||||||
repo = "chia-blockchain";
|
repo = "chia-blockchain";
|
||||||
rev = version;
|
rev = version;
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
hash = "sha256-TNaHPvN19fkRqkQHtqdeEDwhqbntcVhxXhY8TNIScEg=";
|
hash = "sha256-BgUgTYpjFsKisfFni8TzSYQ8+S3P+7m78DuyjWF5xh8=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# chia tries to put lock files in the python modules directory
|
|
||||||
./dont_lock_in_store.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
substituteInPlace setup.py \
|
substituteInPlace setup.py \
|
||||||
--replace "==" ">="
|
--replace "==" ">="
|
||||||
|
@ -59,6 +54,7 @@ let chia = python3Packages.buildPythonApplication rec {
|
||||||
fasteners
|
fasteners
|
||||||
filelock
|
filelock
|
||||||
keyrings-cryptfile
|
keyrings-cryptfile
|
||||||
|
psutil
|
||||||
pyyaml
|
pyyaml
|
||||||
setproctitle
|
setproctitle
|
||||||
setuptools # needs pkg_resources at runtime
|
setuptools # needs pkg_resources at runtime
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
--- a/chia/wallet/puzzles/load_clvm.py
|
|
||||||
+++ b/chia/wallet/puzzles/load_clvm.py
|
|
||||||
@@ -82,18 +82,6 @@ def load_serialized_clvm(clvm_filename, package_or_requirement=__name__) -> Seri
|
|
||||||
"""
|
|
||||||
hex_filename = f"{clvm_filename}.hex"
|
|
||||||
|
|
||||||
- try:
|
|
||||||
- if pkg_resources.resource_exists(package_or_requirement, clvm_filename):
|
|
||||||
- # Establish whether the size is zero on entry
|
|
||||||
- full_path = pathlib.Path(pkg_resources.resource_filename(package_or_requirement, clvm_filename))
|
|
||||||
- output = full_path.parent / hex_filename
|
|
||||||
- compile_clvm(full_path, output, search_paths=[full_path.parent])
|
|
||||||
-
|
|
||||||
- except NotImplementedError:
|
|
||||||
- # pyinstaller doesn't support `pkg_resources.resource_exists`
|
|
||||||
- # so we just fall through to loading the hex clvm
|
|
||||||
- pass
|
|
||||||
-
|
|
||||||
clvm_hex = pkg_resources.resource_string(package_or_requirement, hex_filename).decode("utf8")
|
|
||||||
assert len(clvm_hex.strip()) != 0
|
|
||||||
clvm_blob = bytes.fromhex(clvm_hex)
|
|
Loading…
Reference in a new issue