pyrox.dev
chia-plotter: 1.1.7 -> 1.1.8
+13
-6
pkgs/applications/blockchains/chia-plotter/default.nix
+13
-6
pkgs/applications/blockchains/chia-plotter/default.nix
···
9
9
10
10
stdenv.mkDerivation {
11
11
pname = "chia-plotter";
12
-
version = "1.1.7";
12
+
version = "1.1.8";
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "madMAx43v3r";
16
16
repo = "chia-plotter";
17
-
rev = "18cad340858f0dbcc8dafd0bda1ce1af0fe58c65";
18
-
sha256 = "sha256-lXjeqcjn3+LtnVYngdM1T3on7V7wez4oOAZ0RpKJXMM=";
17
+
rev = "9d7fd929919d1adde6404cb4718a665a81bcef6d";
18
+
sha256 = "sha256-TMAly+Qof2DHPRHqE1nZuHQaCeMo0jEd8MWy4OlXrcs=";
19
19
fetchSubmodules = true;
20
20
};
21
21
···
25
25
src = ./dont_fetch_dependencies.patch;
26
26
pybind11_src = python3Packages.pybind11.src;
27
27
relic_src = fetchFromGitHub {
28
-
owner = "relic-toolkit";
28
+
owner = "Chia-Network";
29
29
repo = "relic";
30
-
rev = "1885ae3b681c423c72b65ce1fe70910142cf941c";
31
-
hash = "sha256-tsSZTcssl8t7Nqdex4BesgQ+ACPgTdtHnJFvS9josN0=";
30
+
rev = "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7";
31
+
hash = "sha256-IfTD8DvTEXeLUoKe4Ejafb+PEJW5DV/VXRYuutwGQHU=";
32
+
};
33
+
sodium_src = fetchFromGitHub {
34
+
owner = "AmineKhaldi";
35
+
repo = "libsodium-cmake";
36
+
rev = "f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65"; # pinned by upstream
37
+
sha256 = "sha256-lGz7o6DQVAuEc7yTp8bYS2kwjzHwGaNjugDi1ruRJOA=";
38
+
fetchSubmodules = true;
32
39
};
33
40
})
34
41
];
+24
-11
pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch
+24
-11
pkgs/applications/blockchains/chia-plotter/dont_fetch_dependencies.patch
···
11
11
+ SOURCE_DIR @pybind11_src@
12
12
)
13
13
FetchContent_MakeAvailable(pybind11 relic)
14
+
15
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
16
+
index 6922167..23d8da6 100644
17
+
--- a/lib/bls-signatures/CMakeLists.txt
18
+
+++ b/lib/bls-signatures/CMakeLists.txt
19
+
@@ -31,29 +31,18 @@ set(CMAKE_MODULE_PATH
20
+
include(FetchContent)
14
21
15
-
diff --git a/lib/bls-signatures/src/CMakeLists.txt b/lib/bls-signatures/src/CMakeLists.txt
16
-
index b762b5d..e06073b 100644
17
-
--- a/lib/bls-signatures/src/CMakeLists.txt
18
-
+++ b/lib/bls-signatures/src/CMakeLists.txt
19
-
@@ -4,18 +4,11 @@ set (CMAKE_CXX_STANDARD 17)
20
-
# CMake 3.14+
21
-
include(FetchContent)
22
+
FetchContent_Declare(Sodium
23
+
- GIT_REPOSITORY https://github.com/AmineKhaldi/libsodium-cmake.git
24
+
- # Latest commit at the moment this was added here
25
+
- # Anchored to libsodium v1.0.18
26
+
- GIT_TAG f73a3fe1afdc4e37ac5fe0ddd401bf521f6bba65
27
+
+ URL @sodium_src@
28
+
)
29
+
set(SODIUM_PCH "on" CACHE STRING "")
30
+
set(SODIUM_DISABLE_TESTS "on" CACHE STRING "")
31
+
set(SODIUM_CHIA_MINIMAL "on" CACHE STRING "")
32
+
FetchContent_MakeAvailable(Sodium)
22
33
23
34
-if (DEFINED ENV{RELIC_MAIN})
24
35
- set(RELIC_GIT_TAG "origin/main")
25
36
-else ()
26
-
- set(RELIC_GIT_TAG "1885ae3b681c423c72b65ce1fe70910142cf941c")
37
+
- # This is currently anchored to upstream aecdcae7956f542fbee2392c1f0feb0a8ac41dc5
38
+
- set(RELIC_GIT_TAG "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7")
27
39
-endif ()
28
40
-
29
41
message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}")
30
42
31
43
FetchContent_Declare(
32
44
relic
33
-
- GIT_REPOSITORY https://github.com/relic-toolkit/relic.git
34
-
- GIT_TAG ${RELIC_GIT_TAG}
45
+
- GIT_REPOSITORY https://github.com/Chia-Network/relic.git
46
+
- GIT_TAG ${RELIC_GIT_TAG}
35
47
+ SOURCE_DIR @relic_src@
36
48
)
37
-
FetchContent_MakeAvailable(relic)
49
+
50
+
# Relic related options
38
51
39
52
diff --git a/CMakeLists.txt b/CMakeLists.txt
40
53
index 970ec74..948441a 100644