Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions docker/dist/base_image/Dockerfile.macos
Original file line number Diff line number Diff line change
@@ -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).
Expand All @@ -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

Expand All @@ -28,4 +30,3 @@ RUN apt-get -qq update \
COPY "build_osxcross.sh" "/root/"
RUN cd /root \
&& ./build_osxcross.sh

5 changes: 3 additions & 2 deletions docker/dist/base_image/Dockerfile.win64
Original file line number Diff line number Diff line change
@@ -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).
Expand All @@ -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

Expand Down Expand Up @@ -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

4 changes: 1 addition & 3 deletions docker/dist/entry_point.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand Down
11 changes: 5 additions & 6 deletions docs/the_nimbus_book/src/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)

<!-- TODO: Please test whether the instructions below are correct. I think we are missing some dependencies on Windows. -->
<!-- Microsoft offer virtual machines that you can use for testing here: -->
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion vendor/nim-libbacktrace
Submodule nim-libbacktrace updated 229 files