From 53d9b49d8639b5c51e81598883a5461d649f7957 Mon Sep 17 00:00:00 2001 From: iphydf Date: Thu, 14 May 2026 18:10:08 +0000 Subject: [PATCH] chore: Update nixpkgs version for bazel 8. --- bazel/Dockerfile | 6 +++--- bazel/arion-pkgs.nix | 4 ++-- bazel/build.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bazel/Dockerfile b/bazel/Dockerfile index ffc180d..0f992b3 100644 --- a/bazel/Dockerfile +++ b/bazel/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/toktok/bazel:913b05c1lqrbd4ac130l6zvzy1bzhc7f AS base +FROM ghcr.io/toktok/bazel:base AS base # Build the base image in a single layer instead of 100 as done by arion. FROM scratch # hadolint ignore=DL3022 @@ -7,8 +7,8 @@ COPY --from=base / / CMD ["/usr/sbin/init"] # We need to know where our bash is, because we haven't set up /bin/sh yet. -ENV NIXOS_VERSION="3a7affa77a5a539afa1c7859e2c31abdb1aeadf3" -SHELL ["/nix/store/35yc81pz0q5yba14lxhn5r3jx5yg6c3l-bash-interactive-5.3p3/bin/bash", "-o", "pipefail", "-c"] +ENV NIXOS_VERSION="549bd84d6279f9852cae6225e372cc67fb91a4c1" +SHELL ["/nix/store/4bwbk4an4bx7cb8xwffghvjjyfyl7m2i-bash-interactive-5.3p9/bin/bash", "-o", "pipefail", "-c"] # Run activation script (init knows where it is). RUN /usr/sbin/init || true diff --git a/bazel/arion-pkgs.nix b/bazel/arion-pkgs.nix index 2e7dd90..dc1bf61 100644 --- a/bazel/arion-pkgs.nix +++ b/bazel/arion-pkgs.nix @@ -1,7 +1,7 @@ let nixpkgs = builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/3a7affa77a5a539afa1c7859e2c31abdb1aeadf3.tar.gz"; - sha256 = "sha256:0bzpgy08ym73g6z9wk3pmsbygv0kq46s6dfc7jwmrh3s5iwngrdf"; + url = "https://github.com/NixOS/nixpkgs/archive/549bd84d6279f9852cae6225e372cc67fb91a4c1.tar.gz"; + sha256 = "sha256:0dchsfq8czjg8iwr60fxmqnglllchcy64wp60b8wx4wd9mwn0rw4"; }; in (import nixpkgs { system = "x86_64-linux"; }).pkgs diff --git a/bazel/build.sh b/bazel/build.sh index 297da51..742c938 100755 --- a/bazel/build.sh +++ b/bazel/build.sh @@ -8,7 +8,7 @@ if ! which nix-shell; then sh install.sh --no-daemon --no-channel-add --yes rm install.sh . "$HOME/.nix-profile/etc/profile.d/nix.sh" - nix-channel --add https://github.com/NixOS/nixpkgs/archive/3a7affa77a5a539afa1c7859e2c31abdb1aeadf3.tar.gz nixpkgs + nix-channel --add https://github.com/NixOS/nixpkgs/archive/549bd84d6279f9852cae6225e372cc67fb91a4c1.tar.gz nixpkgs nix-channel --update fi