Skip to content

Commit ee91c55

Browse files
committed
chore: Update nix version and bazel from 7 to 8.
1 parent d76f4bb commit ee91c55

7 files changed

Lines changed: 12 additions & 11 deletions

File tree

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ jobs:
249249
matrix:
250250
arch: [arm64, x86_64]
251251
macos: ["10.15", "12.0"]
252-
runs-on: ${{ matrix.arch == 'arm64' && 'macos-14' || 'macos-13' }}
252+
runs-on: ${{ matrix.arch == 'arm64' && 'macos-14' || 'macos-15-intel' }}
253253
permissions:
254254
contents: write
255255
steps:

bazel/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/toktok/bazel:wwv31rfsrkzy6lhra7d7apd2w8vh9zph AS base
1+
FROM ghcr.io/toktok/bazel:913b05c1lqrbd4ac130l6zvzy1bzhc7f AS base
22
# Build the base image in a single layer instead of 100 as done by arion.
33
FROM scratch
44
# hadolint ignore=DL3022
@@ -7,8 +7,8 @@ COPY --from=base / /
77
CMD ["/usr/sbin/init"]
88

99
# We need to know where our bash is, because we haven't set up /bin/sh yet.
10-
ENV NIXOS_VERSION="a81bbdfb658428a45c69a42aa73d4bd18127c467"
11-
SHELL ["/nix/store/f33kh08pa7pmy4kvsmsibda46sh46s66-bash-interactive-5.2p37/bin/bash", "-o", "pipefail", "-c"]
10+
ENV NIXOS_VERSION="3a7affa77a5a539afa1c7859e2c31abdb1aeadf3"
11+
SHELL ["/nix/store/35yc81pz0q5yba14lxhn5r3jx5yg6c3l-bash-interactive-5.3p3/bin/bash", "-o", "pipefail", "-c"]
1212

1313
# Run activation script (init knows where it is).
1414
RUN /usr/sbin/init || true

bazel/arion-compose.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ in
1919
services.openssh.enable = true;
2020
services.nscd.enable = false;
2121

22-
system.stateVersion = "24.11";
22+
system.stateVersion = "25.11";
2323
system.nssModules = lib.mkForce [ ];
2424

2525
systemd.sockets.nix-daemon.enable = true;
@@ -31,12 +31,13 @@ in
3131
};
3232

3333
environment.systemPackages = [
34-
pkgs.bazel_7
34+
pkgs.bazel_8
3535
pkgs.bazel-remote
3636
pkgs.coreutils
3737
pkgs.git
3838
# Needed because coursier (for Kotlin) requires that java is in $PATH.
3939
pkgs.jdk21_headless
40+
pkgs.python311
4041
];
4142

4243
security.sudo.wheelNeedsPassword = false;

bazel/arion-pkgs.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
let
22
nixpkgs = builtins.fetchTarball {
3-
url = "https://github.com/NixOS/nixpkgs/archive/a81bbdfb658428a45c69a42aa73d4bd18127c467.tar.gz";
4-
sha256 = "sha256:0vzjqdi39n7l43lzz2w6fv8p112iyj752x68gmjxw2y10cgk0352";
3+
url = "https://github.com/NixOS/nixpkgs/archive/3a7affa77a5a539afa1c7859e2c31abdb1aeadf3.tar.gz";
4+
sha256 = "sha256:0bzpgy08ym73g6z9wk3pmsbygv0kq46s6dfc7jwmrh3s5iwngrdf";
55
};
66
in
77
(import nixpkgs { system = "x86_64-linux"; }).pkgs

bazel/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if ! which nix-shell; then
88
sh install.sh --no-daemon --no-channel-add --yes
99
rm install.sh
1010
. "$HOME/.nix-profile/etc/profile.d/nix.sh"
11-
nix-channel --add https://github.com/NixOS/nixpkgs/archive/a81bbdfb658428a45c69a42aa73d4bd18127c467.tar.gz nixpkgs
11+
nix-channel --add https://github.com/NixOS/nixpkgs/archive/3a7affa77a5a539afa1c7859e2c31abdb1aeadf3.tar.gz nixpkgs
1212
nix-channel --update
1313
fi
1414

qtox/download/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ check_sha256() {
2525
download_file() {
2626
# Curl command wrapper to download a file to the CWD
2727
local URL="$1"
28-
curl -L --connect-timeout 10 -O "$URL"
28+
curl -L -k --connect-timeout 10 -O "$URL"
2929
}
3030

3131
download_verify_extract_tarball() {

qtox/download/download_mpfr.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
set -euo pipefail
88

99
MPFR_VERSION=4.2.1
10-
MPFR_HASH=116715552bd966c85b417c424db1bbdf639f53836eb361549d1f8d6ded5cb4c6
10+
MPFR_HASH=ed8a128e1446e7cca92add1681a6431ba8c1a3250048c6c72648c1bafbe3e8d3
1111

1212
source "$(dirname "$(realpath "$0")")/common.sh"
1313

0 commit comments

Comments
 (0)