Skip to content

Commit

Permalink
stdenvBootstrapTools: update aarch64 gnu
Browse files Browse the repository at this point in the history
I needed to update the aarch64 gnu bootstrap in order to check if the
combinaison of musl / static / aarch64 was still broken when enabling
PIE (NixOS#252310).

In order to that I followed the same approach than in
ea67e45.

Files came from this Hydra build:

  https://hydra.nixos.org/build/262861772

…which used nixpkgs revision a985888
to instantiate:

  /nix/store/rqhq21qxwyhd633wgc53269jzp19y75m-stdenv-bootstrap-tools.drv

…and then built:

  /nix/store/z3sgi7wh8c5pnm3xm2s3kcbwqbw0d5dp-stdenv-bootstrap-tools

I downloaded these files from Hydra and prefetched them into the Nix
store with the following commands:

  STOREPATH=dk28gq49ckmgwpnx36709ff0hxnkmqpk-stdenv-bootstrap-tools
  OPTIONS="--option binary-caches https://cache.nixos.org --option trusted-public-keys cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
  nix --extra-experimental-features nix-command store prefetch-file \
    file://$(nix --extra-experimental-features nix-command store add-file --name bootstrap-tools.tar.xz  $(nix-store ${OPTIONS} -r /nix/store/${STOREPATH})/on-server/bootstrap-tools.tar.xz)
  nix --extra-experimental-features nix-command store prefetch-file --executable \
    file://$(nix --extra-experimental-features nix-command store add-path --name busybox $(nix-store ${OPTIONS} -r /nix/store/${STOREPATH})/on-server/busybox)

These commands produced the following output:

  copying path '/nix/store/dk28gq49ckmgwpnx36709ff0hxnkmqpk-stdenv-bootstrap-tools' from 'https://cache.nixos.org'...
  warning: you did not specify '--add-root'; the result might be removed by the garbage collector
  Downloaded 'file:///nix/store/rpsfzw2ixbdrd5nm4l00y9sjq8h9lg5k-bootstrap-tools.tar.xz' to '/nix/store/ax259maqg6nfdrxznv49as902j1fzhhr-rpsfzw2ixbdrd5nm4l00y9sjq8h9lg5k-bootstrap-tools.tar.xz' (hash 'sha256-Ag5/vwGqv8q9SwdJYmmcvtqcLJjVYNwhgcqQ0BHTTdg=').
  warning: you did not specify '--add-root'; the result might be removed by the garbage collector
  Downloaded 'file:///nix/store/7p38lg5jh4rvgq6aaxqs5sw0gy357z6s-busybox' to '/nix/store/y9bhy7662zdsacn6hr6zp81mzdyb7vzf-7p38lg5jh4rvgq6aaxqs5sw0gy357z6s-busybox' (hash 'sha256-8areJJa2A0xauz5XqwZTgkHSb3qSdi7rTiCI05SaS0Y=').

The sha256sums of all the on-server components:

  $ sha256sum /nix/store/${STOREPATH}/on-server/*
  020e7fbf01aabfcabd4b074962699cbeda9c2c98d560dc2181ca90d011d34dd8  /nix/store/dk28gq49ckmgwpnx36709ff0hxnkmqpk-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz
  8f4e1b1cafbfd3cc1517f477870f3b54170934f09b4c19ae2257acea557fbbca  /nix/store/dk28gq49ckmgwpnx36709ff0hxnkmqpk-stdenv-bootstrap-tools/on-server/busybox
  • Loading branch information
LeSuisse committed Jun 19, 2024
1 parent 4cc5259 commit fba25ee
Showing 1 changed file with 18 additions and 4 deletions.
22 changes: 18 additions & 4 deletions pkgs/stdenv/linux/bootstrap-files/aarch64-unknown-linux-gnu.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
#
# Files came from this Hydra build:
#
# https://hydra.nixos.org/build/262871650
#
# …which used nixpkgs revision a9858885e197f984d92d7fe64e9fff6b2e488d40
# to instantiate:
#
# /nix/store/nxyvqvf7l9hvlkg3ca56gy3jkr5pqrn2-stdenv-bootstrap-tools.drv
#
# …and then built:
#
# /nix/store/dk28gq49ckmgwpnx36709ff0hxnkmqpk-stdenv-bootstrap-tools
#
{
busybox = import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/stdenv-linux/aarch64/21ec906463ea8f11abf3f9091ddd4c3276516e58/busybox";
url = "http://tarballs.nixos.org/stdenv-linux/aarch64/a9858885e197f984d92d7fe64e9fff6b2e488d40/busybox";
executable = true;
hash = "sha256-0MuIeQlBUaeisqoFSu8y+8oB6K4ZG5Lhq8RcS9JqkFQ=";
hash = "sha256-8areJJa2A0xauz5XqwZTgkHSb3qSdi7rTiCI05SaS0Y=";
};
bootstrapTools = import <nix/fetchurl.nix> {
url = "http://tarballs.nixos.org/stdenv-linux/aarch64/21ec906463ea8f11abf3f9091ddd4c3276516e58/bootstrap-tools.tar.xz";
hash = "sha256-aJvtsWeuQHbb14BGZ2EiOKzjQn46h3x3duuPEawG0eE=";
url = "http://tarballs.nixos.org/stdenv-linux/aarch64/a9858885e197f984d92d7fe64e9fff6b2e488d40/bootstrap-tools.tar.xz";
hash = "sha256-Ag5/vwGqv8q9SwdJYmmcvtqcLJjVYNwhgcqQ0BHTTdg=";
};
}

0 comments on commit fba25ee

Please sign in to comment.