diff --git a/pkgs/applications/blockchains/chia-plotter/default.nix b/pkgs/applications/blockchains/chia-plotter/default.nix index 51ca4469bc48..25d4d8653466 100644 --- a/pkgs/applications/blockchains/chia-plotter/default.nix +++ b/pkgs/applications/blockchains/chia-plotter/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "chia-plotter"; - version = "1.1.7"; + version = "1.1.8"; src = fetchFromGitHub { owner = "madMAx43v3r"; repo = "chia-plotter"; - rev = "18cad340858f0dbcc8dafd0bda1ce1af0fe58c65"; - sha256 = "sha256-lXjeqcjn3+LtnVYngdM1T3on7V7wez4oOAZ0RpKJXMM="; + rev = "9d7fd929919d1adde6404cb4718a665a81bcef6d"; + sha256 = "sha256-TMAly+Qof2DHPRHqE1nZuHQaCeMo0jEd8MWy4OlXrcs="; fetchSubmodules = true; }; @@ -25,10 +25,17 @@ stdenv.mkDerivation { src = ./dont_fetch_dependencies.patch; pybind11_src = python3Packages.pybind11.src; relic_src = fetchFromGitHub { - owner = "relic-toolkit"; + owner = "Chia-Network"; repo = "relic"; - rev = "1885ae3b681c423c72b65ce1fe70910142cf941c"; - hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0="; + 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; }; }) ]; diff --git a/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch b/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch index 05486473eef5..b7474af4c963 100644 --- a/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch +++ b/pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch @@ -11,30 +11,43 @@ index 255e3bb..5f99c3a 100644 + SOURCE_DIR @pybind11_src@ ) FetchContent_MakeAvailable(pybind11 relic) - -diff --git a/lib/bls-signatures/src/CMakeLists.txt b/lib/bls-signatures/src/CMakeLists.txt -index b762b5d..e06073b 100644 ---- a/lib/bls-signatures/src/CMakeLists.txt -+++ b/lib/bls-signatures/src/CMakeLists.txt -@@ -4,18 +4,11 @@ set (CMAKE_CXX_STANDARD 17) - # CMake 3.14+ + +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 () -- set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c") +- # 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/relic-toolkit/relic.git -- GIT_TAG ${RELIC_GIT_TAG} +- GIT_REPOSITORY https://github.com/Chia-Network/relic.git +- GIT_TAG ${RELIC_GIT_TAG} + SOURCE_DIR @relic_src@ ) - FetchContent_MakeAvailable(relic) + + # Relic related options diff --git a/CMakeLists.txt b/CMakeLists.txt index 970ec74..948441a 100644