diff --git a/docker/dist/base_image/Dockerfile.macos b/docker/dist/base_image/Dockerfile.macos index 5a195faa6d..1aae9b49e1 100644 --- a/docker/dist/base_image/Dockerfile.macos +++ b/docker/dist/base_image/Dockerfile.macos @@ -1,5 +1,5 @@ # beacon_chain -# Copyright (c) 2021-2023 Status Research & Development GmbH +# Copyright (c) 2021-2025 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -12,6 +12,8 @@ # The only way to make this a part of our reproducible build system is to build # it once, upload it to Docker Hub and make sure it's being pulled regularly so # it's not deleted after 6 months of inactivity. +# +# Mar 2025: CMake is no longer needed, removable when base image is updated FROM ubuntu:20.04 @@ -28,4 +30,3 @@ RUN apt-get -qq update \ COPY "build_osxcross.sh" "/root/" RUN cd /root \ && ./build_osxcross.sh - diff --git a/docker/dist/base_image/Dockerfile.win64 b/docker/dist/base_image/Dockerfile.win64 index 1ffdd22df5..7e52ef5221 100644 --- a/docker/dist/base_image/Dockerfile.win64 +++ b/docker/dist/base_image/Dockerfile.win64 @@ -1,5 +1,5 @@ # beacon_chain -# Copyright (c) 2021-2023 Status Research & Development GmbH +# Copyright (c) 2021-2025 Status Research & Development GmbH # Licensed and distributed under either of # * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT). # * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0). @@ -12,6 +12,8 @@ # The only way to make this a part of our reproducible build system is to build # it once, upload it to Docker Hub and make sure it's being pulled regularly so # it's not deleted after 6 months of inactivity. +# +# Mar 2025: CMake is no longer needed, removable when base image is updated FROM ubuntu:20.04 @@ -55,4 +57,3 @@ RUN \ && cd /opt/mxe \ && make -j $(nproc) MXE_TARGETS='x86_64-w64-mingw32.static' MXE_USE_CCACHE='' DONT_CHECK_REQUIREMENTS=1 cc \ && rm -rf /opt/mxe/.log /opt/mxe/pkg - diff --git a/docker/dist/entry_point.sh b/docker/dist/entry_point.sh index 6b828a2792..966503f761 100755 --- a/docker/dist/entry_point.sh +++ b/docker/dist/entry_point.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2020-2024 Status Research & Development GmbH. Licensed under +# Copyright (c) 2020-2025 Status Research & Development GmbH. Licensed under # either of: # - Apache License, version 2.0 # - MIT license @@ -140,7 +140,6 @@ elif [[ "${PLATFORM}" == "macOS_amd64" ]]; then CC="${CC}" \ AR="x86_64-apple-darwin${DARWIN_VER}-ar" \ RANLIB="x86_64-apple-darwin${DARWIN_VER}-ranlib" \ - CMAKE="x86_64-apple-darwin${DARWIN_VER}-cmake" \ DSYMUTIL="x86_64-apple-darwin${DARWIN_VER}-dsymutil" \ FORCE_DSYMUTIL=1 \ USE_VENDORED_LIBUNWIND=1 \ @@ -172,7 +171,6 @@ elif [[ "${PLATFORM}" == "macOS_arm64" ]]; then CC="${CC}" \ AR="arm64-apple-darwin${DARWIN_VER}-ar" \ RANLIB="arm64-apple-darwin${DARWIN_VER}-ranlib" \ - CMAKE="arm64-apple-darwin${DARWIN_VER}-cmake" \ DSYMUTIL="arm64-apple-darwin${DARWIN_VER}-dsymutil" \ FORCE_DSYMUTIL=1 \ USE_VENDORED_LIBUNWIND=1 \ diff --git a/docs/the_nimbus_book/src/install.md b/docs/the_nimbus_book/src/install.md index 309ef21498..5c8c78749d 100644 --- a/docs/the_nimbus_book/src/install.md +++ b/docs/the_nimbus_book/src/install.md @@ -14,7 +14,6 @@ Check that your machine matches the [minimal system requirements](./hardware.md) When building from source, you will need additional build dependencies to be installed: - Developer tools (C compiler, Make, Bash, Git) -- [CMake](https://cmake.org/) @@ -26,21 +25,21 @@ When building from source, you will need additional build dependencies to be ins ```sh # Debian and Ubuntu - sudo apt-get install build-essential git-lfs cmake + sudo apt-get install build-essential git-lfs # Fedora - dnf install @development-tools cmake + dnf install @development-tools # Arch Linux, using an AUR manager - yourAURmanager -S base-devel git-lfs cmake + yourAURmanager -S base-devel git-lfs ``` === "macOS" - With [Homebrew](https://brew.sh/): + The Command Line Tools package is available as part of Xcode and can be installed via the Terminal application: ```sh - brew install cmake + xcode-select --install ``` === "Windows" diff --git a/nix/default.nix b/nix/default.nix index 0235e46ee0..ee9ffeed75 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { fakeGit = writeScriptBin "git" "echo ${version}"; fakeLsbRelease = writeScriptBin "lsb_release" "echo nix"; in - with pkgs; [ fakeGit fakeLsbRelease which cmake ] + with pkgs; [ fakeGit fakeLsbRelease which ] ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.cctools ]; enableParallelBuilding = true; diff --git a/vendor/nim-libbacktrace b/vendor/nim-libbacktrace index 616e5f4a6e..624d1f8719 160000 --- a/vendor/nim-libbacktrace +++ b/vendor/nim-libbacktrace @@ -1 +1 @@ -Subproject commit 616e5f4a6e2c751b85487e2e855c6b7f90848503 +Subproject commit 624d1f8719d9e34c5d0c1f15652168a1222e1782