Merge pull request #270254 from lourkeur/chia-drop

chia: drop
This commit is contained in:
Pierre Bourdon 2023-11-30 10:21:56 +01:00 committed by GitHub
commit f5c27c6136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 13 additions and 2440 deletions

View file

@ -127,14 +127,6 @@ with lib.maintainers; {
enableFeatureFreezePing = true;
};
chia = {
members = [
lourkeur
];
scope = "Maintain the Chia blockchain and its dependencies";
shortName = "Chia Blockchain";
};
coq = {
members = [
cohencyril

View file

@ -1,65 +0,0 @@
{ lib
, fetchFromGitHub
, substituteAll
, python3Packages
, chia
,
}:
python3Packages.buildPythonApplication rec {
pname = "chia-dev-tools";
version = "1.1.5";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = pname;
rev = "v${version}";
hash = "sha256-qWWLQ+SkoRu5cLytwwrslqsKORy+4ebO8brULEFGaF0=";
};
patches = [
(substituteAll {
src = ./fix-paths.patch;
inherit chia;
})
];
postPatch = ''
substituteInPlace setup.py \
--replace "==" ">="
'';
nativeBuildInputs = [
python3Packages.setuptools-scm
];
# give a hint to setuptools-scm on package version
SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
propagatedBuildInputs = with python3Packages; [
anyio
(toPythonModule chia)
pytest # required at runtime by the "test" command
pytest-asyncio
pytimeparse
];
nativeCheckInputs = with python3Packages; [
pytestCheckHook
];
preCheck = ''
export HOME=$(mktemp -d)
'';
postCheck = "unset HOME";
disabledTests = [
"test_spendbundles"
];
meta = with lib; {
homepage = "https://www.chia.net/";
description = "Utility for developing in the Chia ecosystem: Chialisp functions, object inspection, RPC client and more";
license = with licenses; [ asl20 ];
maintainers = teams.chia.members;
};
}

View file

@ -1,13 +0,0 @@
diff --git a/cdv/cmds/sim_utils.py b/cdv/cmds/sim_utils.py
index e59ba8f..20912ff 100644
--- a/cdv/cmds/sim_utils.py
+++ b/cdv/cmds/sim_utils.py
@@ -67,7 +67,7 @@ async def start_async(root_path: Path, group: Any, restart: bool) -> None:
from chia.cmds.start_funcs import async_start
- sys.argv[0] = str(Path(sys.executable).parent / "chia") # this gives the correct path to the chia executable
+ sys.argv[0] = "@chia@/bin/chia" # this gives the correct path to the chia executable
if root_path.exists():
config = load_config(root_path, "config.yaml")
await async_start(root_path, config, group, restart)

View file

@ -1,73 +0,0 @@
{ lib
, fetchFromGitHub
, stdenv
, libsodium
, cmake
, substituteAll
, python3Packages
}:
stdenv.mkDerivation {
pname = "chia-plotter";
version = "1.1.8";
src = fetchFromGitHub {
owner = "madMAx43v3r";
repo = "chia-plotter";
rev = "9d7fd929919d1adde6404cb4718a665a81bcef6d";
sha256 = "sha256-TMAly+Qof2DHPRHqE1nZuHQaCeMo0jEd8MWy4OlXrcs=";
fetchSubmodules = true;
};
patches = [
# prevent CMake from trying to get libraries on the Internet
(substituteAll {
src = ./dont_fetch_dependencies.patch;
pybind11_src = python3Packages.pybind11.src;
relic_src = fetchFromGitHub {
owner = "Chia-Network";
repo = "relic";
rev = "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7";
hash = "sha256-IfTD8DvTEXeLUoKe4Ejafb+PEJW5DV/VXRYuutwGQHU=";
};
sodium_src = fetchFromGitHub {
owner = "AmineKhaldi";
repo = "libsodium-cmake";
rev = "f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65"; # pinned by upstream
sha256 = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA=";
fetchSubmodules = true;
};
})
];
nativeBuildInputs = [ cmake ];
buildInputs = [ libsodium ];
# These flags come from the upstream build script:
# https://github.com/madMAx43v3r/chia-plotter/blob/974d6e5f1440f68c48492122ca33828a98864dfc/make_devel.sh#L7
CXXFLAGS = "-O3 -fmax-errors=1";
cmakeFlags = [
"-DARITH=easy"
"-DBUILD_BLS_PYTHON_BINDINGS=false"
"-DBUILD_BLS_TESTS=false"
"-DBUILD_BLS_BENCHMARKS=false"
];
installPhase = ''
runHook preInstall
install -D -m 755 chia_plot $out/bin/chia_plot
runHook postInstall
'';
meta = with lib; {
homepage = "https://github.com/madMAx43v3r/chia-plotter";
description = "New implementation of a chia plotter which is designed as a processing pipeline";
license = licenses.gpl3Only;
platforms = platforms.linux;
maintainers = with maintainers; [ ilyakooo0 ];
mainProgram = "chia_plot";
};
}

View file

@ -1,63 +0,0 @@
diff --git a/lib/bls-signatures/python-bindings/CMakeLists.txt b/lib/bls-signatures/python-bindings/CMakeLists.txt
index 255e3bb..5f99c3a 100644
--- a/lib/bls-signatures/python-bindings/CMakeLists.txt
+++ b/lib/bls-signatures/python-bindings/CMakeLists.txt
@@ -6,8 +6,7 @@ include(FetchContent)
FetchContent_Declare(
pybind11
- GIT_REPOSITORY https://github.com/pybind/pybind11.git
- GIT_TAG v2.6.2
+ SOURCE_DIR @pybind11_src@
)
FetchContent_MakeAvailable(pybind11 relic)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6922167..23d8da6 100644
--- a/lib/bls-signatures/CMakeLists.txt
+++ b/lib/bls-signatures/CMakeLists.txt
@@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH
include(FetchContent)
FetchContent_Declare(Sodium
- GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git
- # Latest commit at the moment this was added here
- # Anchored to libsodium v1.0.18
- GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65
+ URL @sodium_src@
)
set(SODIUM_PCH "on" CACHE STRING "")
set(SODIUM_DISABLE_TESTS "on" CACHE STRING "")
set(SODIUM_CHIA_MINIMAL "on" CACHE STRING "")
FetchContent_MakeAvailable(Sodium)
-if (DEFINED ENV{RELIC_MAIN})
- set(RELIC_GIT_TAG "origin/main")
-else ()
- # This is currently anchored to upstream aecdcae7956f542fbee2392c1f0feb0a8ac41dc5
- set(RELIC_GIT_TAG "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7")
-endif ()
-
message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}")
FetchContent_Declare(
relic
- GIT_REPOSITORY https://github.com/Chia-Network/relic.git
- GIT_TAG ${RELIC_GIT_TAG}
+ SOURCE_DIR @relic_src@
)
# Relic related options
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 970ec74..948441a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,7 @@ include_directories(
${BLAKE3_PATH}
${CMAKE_BINARY_DIR}/_deps/relic-src/include
${CMAKE_BINARY_DIR}/_deps/relic-build/include
+ @relic_src@/include
)
IF (WIN32)

View file

@ -1,98 +0,0 @@
{ lib
, cacert
, fetchFromGitHub
, python3Packages
}:
let chia = python3Packages.buildPythonApplication rec {
pname = "chia";
version = "1.7.0";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "chia-blockchain";
rev = version;
fetchSubmodules = true;
hash = "sha256-hsh2HHpm103JfUTPwk+8zIkhVrglIP8xMovFIibn8+g=";
};
postPatch = ''
substituteInPlace setup.py \
--replace "==" ">="
cp ${cacert}/etc/ssl/certs/ca-bundle.crt mozilla-ca/cacert.pem
'';
nativeBuildInputs = [
python3Packages.setuptools-scm
];
# give a hint to setuptools-scm on package version
SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
propagatedBuildInputs = with python3Packages; [
aiofiles
aiohttp
aiosqlite
bitstring
blspy
chiapos
chiavdf
chiabip158
chia-rs
click
clvm
clvm-rs
clvm-tools
clvm-tools-rs
colorama
colorlog
concurrent-log-handler
cryptography
dnslib
dnspython
fasteners
filelock
keyrings-cryptfile
psutil
pyyaml
setproctitle
setuptools # needs pkg_resources at runtime
sortedcontainers
watchdog
websockets
zstd
];
nativeCheckInputs = with python3Packages; [
pytestCheckHook
];
# Testsuite is expensive and non-deterministic, so it is available in
# passthru.tests instead.
doCheck = false;
disabledTests = [
"test_spend_through_n"
"test_spend_zero_coin"
"test_default_cached_master_passphrase"
"test_using_legacy_keyring"
];
preCheck = ''
export HOME=`mktemp -d`
'';
passthru.tests = {
chiaWithTests = chia.overrideAttrs (_: { doCheck = true; });
};
meta = with lib; {
homepage = "https://www.chia.net/";
description = "Chia is a modern cryptocurrency built from scratch, designed to be efficient, decentralized, and secure.";
license = with licenses; [ asl20 ];
maintainers = teams.chia.members;
platforms = platforms.all;
};
};
in chia

View file

@ -1,78 +0,0 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, setuptools-scm
, substituteAll
, cmake
, boost
, gmp
, pybind11
, pythonOlder
}:
buildPythonPackage rec {
pname = "blspy";
version = "1.0.16";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-XABdS6CCUJpZ9N1Vra078V0HoDU32u1l3yz96ZKHwFc=";
};
patches = [
# prevent CMake from trying to get libraries on the Internet
(substituteAll {
src = ./dont_fetch_dependencies.patch;
pybind11_src = pybind11.src;
relic_src = fetchFromGitHub {
owner = "Chia-Network";
repo = "relic";
rev = "215c69966cb78b255995f0ee9c86bbbb41c3c42b"; # pinned by blspy
hash = "sha256-wivK18Cp7BMZJvrYxJgSHInRZgFgsgSzd0YIy5IWoYA=";
};
sodium_src = fetchFromGitHub {
owner = "AmineKhaldi";
repo = "libsodium-cmake";
rev = "f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65"; # pinned by blspy
hash = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA=";
fetchSubmodules = true;
};
catch2_src = fetchFromGitHub {
owner = "catchorg";
repo = "Catch2";
rev = "v3.0.0-preview5"; # pinned by blspy
hash = "sha256-IQ1yGZo3nKHTqScUoq3i3Njxqvk7uW8hQ3GT0/SxGaw=";
};
})
];
# ImportError: cannot import name 'setuptools' from 'setuptools'
# this is resolved in the next release, v2
postPatch = ''
substituteInPlace setup.py \
--replace "from setuptools import Extension, setup, setuptools" "from setuptools import Extension, setup"
'';
nativeBuildInputs = [ cmake setuptools-scm ];
buildInputs = [ boost gmp.static pybind11 ];
pythonImportsCheck = [
"blspy"
];
# Note: upstream testsuite is just a single test.py script outside of any framework
doCheck = false;
# CMake needs to be run by setuptools rather than by its hook
dontConfigure = true;
meta = with lib; {
description = "BLS signatures with aggregation";
homepage = "https://github.com/Chia-Network/bls-signatures/";
license = licenses.asl20;
maintainers = teams.chia.members;
};
}

View file

@ -1,64 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7922652..d85b058 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH
include(FetchContent)
FetchContent_Declare(Sodium
- GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git
- # Latest commit at the moment this was added here
- # Anchored to libsodium v1.0.18
- GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65
+ URL /nix/store/2nj48a8vb7rzxhwaigdcpa0yyax7yrv7-source
)
set(SODIUM_PCH "on" CACHE STRING "")
set(SODIUM_DISABLE_TESTS "on" CACHE STRING "")
set(SODIUM_CHIA_MINIMAL "on" CACHE STRING "")
FetchContent_MakeAvailable(Sodium)
-if (DEFINED ENV{RELIC_MAIN})
- set(RELIC_GIT_TAG "origin/main")
-else ()
- # This is currently anchored to upstream aecdcae7956f542fbee2392c1f0feb0a8ac41dc5
- set(RELIC_GIT_TAG "215c69966cb78b255995f0ee9c86bbbb41c3c42b")
-endif ()
-
message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}")
FetchContent_Declare(
relic
- GIT_REPOSITORY https://github.com/Chia-Network/relic.git
- GIT_TAG ${RELIC_GIT_TAG}
+ SOURCE_DIR /nix/store/6r9v1cmmy535q2y0pk0bkjh3ppyzb2ch-source
)
# Relic related options
diff --git a/python-bindings/CMakeLists.txt b/python-bindings/CMakeLists.txt
index 2e331c3..d9aa940 100644
--- a/python-bindings/CMakeLists.txt
+++ b/python-bindings/CMakeLists.txt
@@ -1,8 +1,7 @@
FetchContent_Declare(
pybind11
- GIT_REPOSITORY https://github.com/pybind/pybind11.git
- GIT_TAG v2.10.0
+ SOURCE_DIR @pybind11_src@
)
FetchContent_MakeAvailable(pybind11 relic)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3164f7f..15a955e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,8 +37,7 @@ install(FILES $<TARGET_FILE:bls> DESTINATION lib)
if(BUILD_BLS_TESTS)
FetchContent_Declare(
Catch2
- GIT_REPOSITORY https://github.com/catchorg/Catch2.git
- GIT_TAG v3.0.0-preview5
+ URL @catch2_src@
)
FetchContent_MakeAvailable(Catch2)
add_executable(runtest test.cpp)

File diff suppressed because it is too large Load diff

View file

@ -1,54 +0,0 @@
{ buildPythonPackage
, lib
, fetchFromGitHub
, pytestCheckHook
, rustPlatform
}:
buildPythonPackage rec {
pname = "chia-rs";
version = "0.2.10";
src = fetchFromGitHub {
owner = "chia-network";
repo = "chia_rs";
rev = "refs/tags/${version}";
hash = "sha256-MFVWdpfvmvGfWIuVdrigGucP52/dB4xCO4Pn1RvUJnM=";
};
patches = [
# undo a hack from upstream that confuses our build hook
./fix-build.patch
];
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
};
postPatch = ''
cp ${./Cargo.lock} Cargo.lock
'';
nativeBuildInputs = with rustPlatform; [
cargoSetupHook
maturinBuildHook
];
preBuild = ''
# avoid ENOENT in maturinBuildHook
touch wheel/Cargo.lock
'';
nativeCheckInputs = [
pytestCheckHook
];
buildAndTestSubdir = "wheel";
meta = with lib; {
description = "Rust crate & wheel with consensus code";
homepage = "https://github.com/Chia-Network/chia_rs/";
license = licenses.asl20;
maintainers = teams.chia.members;
};
}

View file

@ -1,12 +0,0 @@
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,8 +1,5 @@
-# the "wheel" crate is excluded from the workspace because pyo3 has problems with
-# "cargo test" and "cargo bench"
[workspace]
-members = ["wasm", "chia_streamable_macro", "chia-bls", "clvm-utils", "chia-protocol", "chia_py_streamable_macro"]
-exclude = ["wheel"]
+members = ["wasm", "wheel", "chia_streamable_macro", "chia-bls", "clvm-utils", "chia-protocol", "chia_py_streamable_macro"]
[package]
name = "chia"

View file

@ -1,40 +0,0 @@
{ stdenv
, lib
, buildPythonPackage
, fetchPypi
, cmake
, pybind11
, pythonOlder
, pytestCheckHook
, setuptools-scm
}:
buildPythonPackage rec {
pname = "chiabip158";
version = "1.3";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-HUgYVVQ7yc2X3ffnV7mCZf+oFUHl/29Mb4n91dRJ7gc=";
};
nativeBuildInputs = [ cmake setuptools-scm ];
buildInputs = [ pybind11 ];
nativeCheckInputs = [
pytestCheckHook
];
# CMake needs to be run by setuptools rather than by its hook
dontConfigure = true;
meta = with lib; {
broken = stdenv.isDarwin;
description = "Chia's implementation of BIP 158";
homepage = "https://www.chia.net/";
license = licenses.asl20;
maintainers = teams.chia.members;
};
}

View file

@ -1,62 +0,0 @@
{ stdenv
, lib
, substituteAll
, buildPythonPackage
, fetchPypi
, catch2
, cmake
, cxxopts
, ghc_filesystem
, pybind11
, pytestCheckHook
, pythonOlder
, psutil
, setuptools-scm
}:
buildPythonPackage rec {
pname = "chiapos";
version = "1.0.11";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-TMRf9549z3IQzGt5c53Rk1Vq3tdrpZ3Pqc8jhj4AKzo=";
};
patches = [
# prevent CMake from trying to get libraries on the Internet
(substituteAll {
src = ./dont_fetch_dependencies.patch;
inherit cxxopts ghc_filesystem;
catch2_src = catch2.src;
pybind11_src = pybind11.src;
})
];
nativeBuildInputs = [ cmake setuptools-scm ];
buildInputs = [ pybind11 ];
nativeCheckInputs = [
psutil
pytestCheckHook
];
# A fix for cxxopts >=3.1
postPatch = ''
substituteInPlace src/cli.cpp \
--replace "cxxopts::OptionException" "cxxopts::exceptions::exception"
'';
# CMake needs to be run by setuptools rather than by its hook
dontConfigure = true;
meta = with lib; {
broken = stdenv.isDarwin;
description = "Chia proof of space library";
homepage = "https://www.chia.net/";
license = licenses.asl20;
maintainers = teams.chia.members;
};
}

View file

@ -1,41 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1dd25d..96abc65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,23 +21,20 @@ include(${CMAKE_INSTALL_PREFIX}/share/cmake/pybind11/pybind11Config.cmake)
else()
FetchContent_Declare(
pybind11-src
- GIT_REPOSITORY https://github.com/pybind/pybind11.git
- GIT_TAG v2.10.0
+ SOURCE_DIR @pybind11_src@
)
FetchContent_MakeAvailable(pybind11-src)
endif()
FetchContent_Declare(
cxxopts
- GIT_REPOSITORY https://github.com/jarro2783/cxxopts.git
- GIT_TAG v2.2.1
+ SOURCE_DIR @cxxopts@
)
FetchContent_MakeAvailable(cxxopts)
FetchContent_Declare(
gulrak
- GIT_REPOSITORY https://github.com/gulrak/filesystem.git
- GIT_TAG v1.5.6
+ SOURCE_DIR @ghc_filesystem@
)
FetchContent_MakeAvailable(gulrak)
@@ -150,8 +147,7 @@ ENDIF()
FetchContent_Declare(
Catch2
- GIT_REPOSITORY https://github.com/catchorg/Catch2.git
- GIT_TAG v2.13.7
+ SOURCE_DIR @catch2_src@
)
FetchContent_MakeAvailable(Catch2)

View file

@ -1,54 +0,0 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, setuptools-scm
, substituteAll
, cmake
, boost
, gmp
, pybind11
, pytestCheckHook
, pythonOlder
}:
buildPythonPackage rec {
pname = "chiavdf";
version = "1.0.11";
disabled = pythonOlder "3.8";
src = fetchPypi {
inherit pname version;
hash = "sha256-PjUgpMTdWLMFQdnrpeWmn8vA8SlORjmu52ODc/2hivE=";
};
patches = [
# prevent CMake from trying to get libraries on the Internet
(substituteAll {
src = ./dont_fetch_dependencies.patch;
pybind11_src = pybind11.src;
})
];
# x86 instructions are needed for this component
BUILD_VDF_CLIENT = lib.optionalString (!stdenv.isx86_64) "N";
nativeBuildInputs = [ cmake setuptools-scm ];
buildInputs = [ boost gmp pybind11 ];
nativeCheckInputs = [
pytestCheckHook
];
# CMake needs to be run by setuptools rather than by its hook
dontConfigure = true;
meta = with lib; {
broken = stdenv.isDarwin;
description = "Chia verifiable delay function utilities";
homepage = "https://www.chia.net/";
license = licenses.asl20;
maintainers = teams.chia.members;
};
}

View file

@ -1,14 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fb92c4d..9fa52ef 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,8 +31,7 @@ include(FetchContent)
FetchContent_Declare(
pybind11-src
- GIT_REPOSITORY https://github.com/pybind/pybind11.git
- GIT_TAG v2.10.0
+ SOURCE_DIR @pybind11_src@
)
FetchContent_MakeAvailable(pybind11-src)

View file

@ -1,51 +0,0 @@
{ stdenv
, lib
, fetchFromGitHub
, buildPythonPackage
, rustPlatform
, pythonOlder
, openssl
, perl
}:
buildPythonPackage rec {
pname = "clvm_rs";
version = "0.3.0";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "clvm_rs";
rev = version;
hash = "sha256-DJviuIBJg+MF0NvmdeWK31nV+q4UZCRdmdbEAJqwXXg=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-bgXUSm3M8J7E2ohPjPIimHJvz1ivWrsliKZlgchOdhQ=";
};
format = "pyproject";
buildAndTestSubdir = "wheel";
nativeBuildInputs = [
perl # used by openssl-sys to configure
] ++ (with rustPlatform; [
cargoSetupHook
maturinBuildHook
]);
buildInputs = [ openssl ];
pythonImportsCheck = [ "clvm_rs" ];
meta = with lib; {
broken = stdenv.isDarwin;
homepage = "https://chialisp.com/";
description = "Rust implementation of clvm";
license = licenses.asl20;
maintainers = teams.chia.members;
};
}

View file

@ -1,40 +0,0 @@
{ lib
, fetchFromGitHub
, buildPythonPackage
, rustPlatform
, pythonOlder
}:
buildPythonPackage rec {
pname = "clvm-tools-rs";
version = "0.1.30";
disabled = pythonOlder "3.7";
format = "pyproject";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "clvm_tools_rs";
rev = version;
hash = "sha256-7eGOJgcZcSGmvLJc5BVfWarcu9kQb/uEcnG70JWXDSw=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-46WEmp1FT6biM9A2M7z5onb45XhWjePKb6NSwLjuemc=";
};
nativeBuildInputs = with rustPlatform; [
cargoSetupHook
maturinBuildHook
];
pythonImportsCheck = [ "clvm_tools_rs" ];
meta = with lib; {
homepage = "https://chialisp.com/";
description = "Rust port of clvm_tools";
license = licenses.asl20;
maintainers = teams.chia.members;
};
}

View file

@ -1,53 +0,0 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, clvm
, clvm-tools-rs
, setuptools-scm
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "clvm_tools";
version = "0.4.6";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "clvm_tools";
rev = version;
hash = "sha256-MAtVTSv1RR2/7QEKCOEQ+QH5vK4aE0Us2TXyRRAMl8U=";
};
nativeBuildInputs = [
setuptools-scm
];
propagatedBuildInputs = [
clvm
clvm-tools-rs
];
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"clvm_tools"
];
disabledTests = [
"test_cmd_unknown-1_txt"
];
# give a hint to setuptools-scm on package version
SETUPTOOLS_SCM_PRETEND_VERSION="v${version}";
meta = with lib; {
description = "Tools for clvm development";
homepage = "https://www.chialisp.com/";
license = licenses.asl20;
maintainers = teams.chia.members;
};
}

View file

@ -1,52 +0,0 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonOlder
, blspy
, setuptools-scm
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "clvm";
version = "0.9.7";
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "Chia-Network";
repo = "clvm";
rev = version;
hash = "sha256-kTmuiy0IbTGjDokZjxp3p8lr/0uVxG/0pRN2hETLBtA=";
};
nativeBuildInputs = [
setuptools-scm
];
# give a hint to setuptools-scm on package version
SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
propagatedBuildInputs = [
blspy
];
nativeCheckInputs = [
pytestCheckHook
];
disabledTestPaths = [
# all tests in this file have a circular dependency on clvm-tools
"tests/cmds_test.py"
];
pythonImportsCheck = [
"clvm"
];
meta = with lib; {
description = "Chia Lisp virtual machine";
homepage = "https://www.chia.net/";
license = licenses.asl20;
maintainers = teams.chia.members;
};
}

View file

@ -27,6 +27,6 @@ buildPythonPackage rec {
description = "Python logging handler that allows multiple processes to safely write to the same log file concurrently";
homepage = "https://pypi.org/project/concurrent-log-handler";
license = licenses.asl20;
maintainers = teams.chia.members;
maintainers = [ maintainers.lourkeur ];
};
}

View file

@ -50,6 +50,6 @@ buildPythonPackage rec {
homepage = "https://github.com/frispete/keyrings.cryptfile";
changelog = "https://github.com/frispete/keyrings.cryptfile/blob/v${version}/CHANGES.md";
license = licenses.mit;
maintainers = teams.chia.members;
maintainers = [ maintainers.lourkeur ];
};
}

View file

@ -1,14 +0,0 @@
diff --git a/setup.cfg b/setup.cfg
index ec7eb30..7ffd831 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,9 +5,6 @@ dists = clean --all sdist bdist_wheel
[wheel]
universal = 1
-[tool:pytest]
-addopts = -s --cov=keyrings/cryptfile
-
[egg_info]
tag_build =
tag_date = 0

View file

@ -37012,11 +37012,11 @@ with pkgs;
cgminer = callPackage ../applications/blockchains/cgminer { };
chia = callPackage ../applications/blockchains/chia { };
chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
chia-dev-tools = callPackage ../applications/blockchains/chia-dev-tools { };
chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
chia-plotter = callPackage ../applications/blockchains/chia-plotter { };
chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
clboss = callPackage ../applications/blockchains/clboss { };

View file

@ -1524,8 +1524,6 @@ self: super: with self; {
blosc2 = callPackage ../development/python-modules/blosc2 { };
blspy = callPackage ../development/python-modules/blspy { };
bluemaestro-ble = callPackage ../development/python-modules/bluemaestro-ble { };
bluepy = callPackage ../development/python-modules/bluepy { };
@ -1976,13 +1974,13 @@ self: super: with self; {
chex = callPackage ../development/python-modules/chex { };
chiabip158 = callPackage ../development/python-modules/chiabip158 { };
chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
chiapos = callPackage ../development/python-modules/chiapos { };
chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
chiavdf = callPackage ../development/python-modules/chiavdf { };
chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
chia-rs = callPackage ../development/python-modules/chia-rs { };
chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
chirpstack-api = callPackage ../development/python-modules/chirpstack-api { };
@ -2150,13 +2148,13 @@ self: super: with self; {
clustershell = callPackage ../development/python-modules/clustershell { };
clvm = callPackage ../development/python-modules/clvm { };
clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
clvm-rs = callPackage ../development/python-modules/clvm-rs { };
clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
clvm-tools = callPackage ../development/python-modules/clvm-tools { };
clvm-tools = throw "clvm-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
clvm-tools-rs = callPackage ../development/python-modules/clvm-tools-rs { };
clvm-tools-rs = throw "clvm-tools-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254";
cma = callPackage ../development/python-modules/cma { };