Skip to content

Commit 00f2bb8

Browse files
authored
Bump nim-libbacktrace to 624d1f8719d9e34c5d0c1f15652168a1222e1782 (#6930)
- Always use system unwinder
1 parent 9dbeb4e commit 00f2bb8

File tree

6 files changed

+14
-15
lines changed

6 files changed

+14
-15
lines changed

docker/dist/base_image/Dockerfile.macos

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2021-2023 Status Research & Development GmbH
2+
# Copyright (c) 2021-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -12,6 +12,8 @@
1212
# The only way to make this a part of our reproducible build system is to build
1313
# it once, upload it to Docker Hub and make sure it's being pulled regularly so
1414
# it's not deleted after 6 months of inactivity.
15+
#
16+
# Mar 2025: CMake is no longer needed, removable when base image is updated
1517

1618
FROM ubuntu:20.04
1719

@@ -28,4 +30,3 @@ RUN apt-get -qq update \
2830
COPY "build_osxcross.sh" "/root/"
2931
RUN cd /root \
3032
&& ./build_osxcross.sh
31-

docker/dist/base_image/Dockerfile.win64

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# beacon_chain
2-
# Copyright (c) 2021-2023 Status Research & Development GmbH
2+
# Copyright (c) 2021-2025 Status Research & Development GmbH
33
# Licensed and distributed under either of
44
# * MIT license (license terms in the root directory or at https://opensource.org/licenses/MIT).
55
# * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
@@ -12,6 +12,8 @@
1212
# The only way to make this a part of our reproducible build system is to build
1313
# it once, upload it to Docker Hub and make sure it's being pulled regularly so
1414
# it's not deleted after 6 months of inactivity.
15+
#
16+
# Mar 2025: CMake is no longer needed, removable when base image is updated
1517

1618
FROM ubuntu:20.04
1719

@@ -55,4 +57,3 @@ RUN \
5557
&& cd /opt/mxe \
5658
&& make -j $(nproc) MXE_TARGETS='x86_64-w64-mingw32.static' MXE_USE_CCACHE='' DONT_CHECK_REQUIREMENTS=1 cc \
5759
&& rm -rf /opt/mxe/.log /opt/mxe/pkg
58-

docker/dist/entry_point.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright (c) 2020-2024 Status Research & Development GmbH. Licensed under
3+
# Copyright (c) 2020-2025 Status Research & Development GmbH. Licensed under
44
# either of:
55
# - Apache License, version 2.0
66
# - MIT license
@@ -140,7 +140,6 @@ elif [[ "${PLATFORM}" == "macOS_amd64" ]]; then
140140
CC="${CC}" \
141141
AR="x86_64-apple-darwin${DARWIN_VER}-ar" \
142142
RANLIB="x86_64-apple-darwin${DARWIN_VER}-ranlib" \
143-
CMAKE="x86_64-apple-darwin${DARWIN_VER}-cmake" \
144143
DSYMUTIL="x86_64-apple-darwin${DARWIN_VER}-dsymutil" \
145144
FORCE_DSYMUTIL=1 \
146145
USE_VENDORED_LIBUNWIND=1 \
@@ -172,7 +171,6 @@ elif [[ "${PLATFORM}" == "macOS_arm64" ]]; then
172171
CC="${CC}" \
173172
AR="arm64-apple-darwin${DARWIN_VER}-ar" \
174173
RANLIB="arm64-apple-darwin${DARWIN_VER}-ranlib" \
175-
CMAKE="arm64-apple-darwin${DARWIN_VER}-cmake" \
176174
DSYMUTIL="arm64-apple-darwin${DARWIN_VER}-dsymutil" \
177175
FORCE_DSYMUTIL=1 \
178176
USE_VENDORED_LIBUNWIND=1 \

docs/the_nimbus_book/src/install.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Check that your machine matches the [minimal system requirements](./hardware.md)
1414
When building from source, you will need additional build dependencies to be installed:
1515

1616
- Developer tools (C compiler, Make, Bash, Git)
17-
- [CMake](https://cmake.org/)
1817

1918
<!-- TODO: Please test whether the instructions below are correct. I think we are missing some dependencies on Windows. -->
2019
<!-- Microsoft offer virtual machines that you can use for testing here: -->
@@ -26,21 +25,21 @@ When building from source, you will need additional build dependencies to be ins
2625

2726
```sh
2827
# Debian and Ubuntu
29-
sudo apt-get install build-essential git-lfs cmake
28+
sudo apt-get install build-essential git-lfs
3029

3130
# Fedora
32-
dnf install @development-tools cmake
31+
dnf install @development-tools
3332

3433
# Arch Linux, using an AUR manager
35-
yourAURmanager -S base-devel git-lfs cmake
34+
yourAURmanager -S base-devel git-lfs
3635
```
3736

3837
=== "macOS"
3938

40-
With [Homebrew](https://brew.sh/):
39+
The Command Line Tools package is available as part of Xcode and can be installed via the Terminal application:
4140

4241
```sh
43-
brew install cmake
42+
xcode-select --install
4443
```
4544

4645
=== "Windows"

nix/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
3535
fakeGit = writeScriptBin "git" "echo ${version}";
3636
fakeLsbRelease = writeScriptBin "lsb_release" "echo nix";
3737
in
38-
with pkgs; [ fakeGit fakeLsbRelease which cmake ]
38+
with pkgs; [ fakeGit fakeLsbRelease which ]
3939
++ lib.optionals stdenv.isDarwin [ pkgs.darwin.cctools ];
4040

4141
enableParallelBuilding = true;

vendor/nim-libbacktrace

Submodule nim-libbacktrace updated 229 files

0 commit comments

Comments
 (0)