From 516f2db69849ae66956f634c466f741afa451a8c Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Fri, 5 Nov 2021 12:10:09 +0100 Subject: python3Packages.dnspythonchia: init at 2.2.0 --- .../python-modules/dnspythonchia/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/dnspythonchia/default.nix diff --git a/pkgs/development/python-modules/dnspythonchia/default.nix b/pkgs/development/python-modules/dnspythonchia/default.nix new file mode 100644 index 00000000000..52243eac7d8 --- /dev/null +++ b/pkgs/development/python-modules/dnspythonchia/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, setuptools-scm +}: + +buildPythonPackage rec { + pname = "dnspythonchia"; + version = "2.2.0"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-iYaPYqOZ33R2DUXgIHxsewLi79iB5ja0WHOGkamffZk="; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + # needs networking for some tests + doCheck = false; + pythonImportsCheck = [ "dns" ]; + + meta = with lib; { + description = "A DNS toolkit for Python (Chia Network fork)"; + homepage = "https://www.chia.net/"; + license = with licenses; [ isc ]; + maintainers = teams.chia.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 595967fa63b..e69341c8301 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2251,6 +2251,8 @@ in { dnspython = callPackage ../development/python-modules/dnspython { }; + dnspythonchia = callPackage ../development/python-modules/dnspythonchia { }; + doc8 = callPackage ../development/python-modules/doc8 { }; docker = callPackage ../development/python-modules/docker { }; -- cgit 1.4.1 From 8ac539219d5c71657d27ee45c92eda24a758f826 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Fri, 5 Nov 2021 12:15:47 +0100 Subject: python3Packages.clvm-rs: 0.1.14 -> 0.1.15 --- .../python-modules/clvm-rs/bump-cargo-lock.patch | 11 +++++++++++ pkgs/development/python-modules/clvm-rs/default.nix | 13 +++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch diff --git a/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch b/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch new file mode 100644 index 00000000000..9939e6fb43a --- /dev/null +++ b/pkgs/development/python-modules/clvm-rs/bump-cargo-lock.patch @@ -0,0 +1,11 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -80,7 +80,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "clvm_rs" +-version = "0.1.14" ++version = "0.1.15" + dependencies = [ + "bls12_381", + "hex", diff --git a/pkgs/development/python-modules/clvm-rs/default.nix b/pkgs/development/python-modules/clvm-rs/default.nix index 7cde70fd97f..ec078970bc1 100644 --- a/pkgs/development/python-modules/clvm-rs/default.nix +++ b/pkgs/development/python-modules/clvm-rs/default.nix @@ -9,20 +9,25 @@ buildPythonPackage rec { pname = "clvm_rs"; - version = "0.1.14"; + version = "0.1.15"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_rs"; rev = version; - sha256 = "sha256-sQ+jzBiIZYVQj2rb170wLFEx2NzOj7kEL0k0gx/JOAc="; + sha256 = "sha256-4QFreQlRjKqGhPvuXU/pZpxMfF8LkIf6X7C3K2q77MI="; }; + patches = [ + # upstream forgot to refresh the lock file + ./bump-cargo-lock.patch + ]; + cargoDeps = rustPlatform.fetchCargoTarball { - inherit src; + inherit src patches; name = "${pname}-${version}"; - sha256 = "sha256-ZSu3bu0MfxZEFqBwdHH/RM4WTF/yx9ju1IqSVfu+Upo="; + sha256 = "sha256-jPNU+P6JgxTPL1GYUBE4VPU3p6cgL8u/+AIELr7r5Mk="; }; format = "pyproject"; -- cgit 1.4.1 From 29791cd7aa0deddca087836a18da1e8cf94180e3 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Fri, 5 Nov 2021 19:39:36 +0100 Subject: python3Packages.chiapos: 1.0.4 -> 1.0.6 --- pkgs/development/python-modules/chiapos/default.nix | 11 ++++++++--- .../python-modules/chiapos/dont_fetch_dependencies.patch | 9 ++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/chiapos/default.nix b/pkgs/development/python-modules/chiapos/default.nix index 587c2fbf3c7..42bf21dd521 100644 --- a/pkgs/development/python-modules/chiapos/default.nix +++ b/pkgs/development/python-modules/chiapos/default.nix @@ -6,6 +6,7 @@ , cxxopts , ghc_filesystem , pybind11 +, pytestCheckHook , pythonOlder , psutil , setuptools-scm @@ -13,12 +14,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.4"; + version = "1.0.6"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-flI1vwtD0H28UDMcEEELECewkXZ6vf/XEYMqRKy5R6w="; + sha256 = "sha256-Zh5AULPgbG0oYPcBZMp/vm94MPyfdtYn4P5V+1LeMqA="; }; patches = [ @@ -34,7 +35,11 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; - checkInputs = [ psutil ]; + checkInputs = [ + psutil + pytestCheckHook + ]; + # CMake needs to be run by setuptools rather than by its hook dontConfigure = true; diff --git a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch index 25102116969..85b7560f5d0 100644 --- a/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch +++ b/pkgs/development/python-modules/chiapos/dont_fetch_dependencies.patch @@ -1,13 +1,13 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9b4a2f5..86f849c 100644 +index b757b70..fcce055 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -18,22 +18,19 @@ include(FetchContent) - else() +@@ -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.6.2 +- GIT_TAG v2.7.1 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11-src) @@ -29,4 +29,3 @@ index 9b4a2f5..86f849c 100644 ) FetchContent_MakeAvailable(gulrak) - -- cgit 1.4.1 From 5d389f21e1744c0131e6be31994978c4062a5412 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Fri, 5 Nov 2021 12:18:13 +0100 Subject: chia: 1.2.10 -> 1.2.11 --- pkgs/applications/blockchains/chia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 83d9cee9ec6..b508cd26fc9 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -6,14 +6,14 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.2.10"; + version = "1.2.11"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - sha256 = "sha256-TzSBGjgaE0IWaqJcCIoO/u+gDh17NtAqhE8ldbbjNIE="; + sha256 = "sha256-hRpZce8ydEsyq7htNfzlRSKPwMAOUurC3uiQpX6WiB8="; }; postPatch = '' @@ -46,7 +46,7 @@ let chia = python3Packages.buildPythonApplication rec { colorlog concurrent-log-handler cryptography - dnspython + dnspythonchia fasteners keyrings-cryptfile pyyaml -- cgit 1.4.1