stdenv.darwin: bootstrap darwin using updated tools#295558
Merged
1 commit merged intostagingfrom Mar 28, 2024
unknown repository
Merged
stdenv.darwin: bootstrap darwin using updated tools#2955581 commit merged intostagingfrom unknown repository
1 commit merged intostagingfrom
unknown repository
Conversation
This was referenced Mar 13, 2024
ofborg
bot
added
the
10.rebuild-darwin-stdenv
ofborg
bot
added
10.rebuild-darwin: 501+
- update the hashes and tools needed to extract the bootstrap-tools archive - unify the x64 and aarch64 unpack process - unpin libxml for python-minimal
toonn
approved these changes
Mar 22, 2024
Contributor
toonn
left a comment
toonn
left a comment
There was a problem hiding this comment.
LGTM (didn't rerun a stdenv build though).
Author
|
cc @lovesegfault for uploading new bootstrap-tools to tarballs.nixos.org aarch64-apple-darwinSuggested commands to upload files to 'tarballs.nixos.org': x86_64-apple-darwinSuggested commands to upload files to 'tarballs.nixos.org': |
Author
|
ping @lovesegfault #295558 (comment) for updating the tools into tarball.nixos.org |
ghost
mentioned this pull request
13 tasks
Member
|
@a-n-n-a-l-e-e I'm happy to help with uploading the tarballs, but I'd like to see an approval from @reckenrode and for this to be un-drafted before that :) |
Author
this is in draft mode so it doesn't get committed by accident, as noted in the PR comment, to avoid incidents like #255451 |
Contributor
|
I’ll take a look at it this evening. It’d definitely be nice to update the bootstrap tools and simplify the stdenv bootstrap. |
reckenrode
approved these changes
Mar 28, 2024
Contributor
reckenrode
left a comment
reckenrode
left a comment
There was a problem hiding this comment.
lgtm. I successfully built the stdenv on both aarch64-darwin and x86_64-darwin.
ghost
marked this pull request as ready for review
Author
|
ok @lovesegfault, i think this meets your criteria for uploading the tarballs, i'd like to get this completed before the next staging cycle begins. thx. |
Member
|
Uploaded: $ nix-store --realize /nix/store/sxc61dx6sng17lpp2rvv1q2apxj7bvq2-stdenv-bootstrap-tools
this path will be fetched (78.61 MiB download, 276.71 MiB unpacked):
/nix/store/sxc61dx6sng17lpp2rvv1q2apxj7bvq2-stdenv-bootstrap-tools
copying path '/nix/store/sxc61dx6sng17lpp2rvv1q2apxj7bvq2-stdenv-bootstrap-tools' from 'https://cache.nixos.org'...
warning: you did not specify '--add-root'; the result might be removed by the garbage collector
/nix/store/sxc61dx6sng17lpp2rvv1q2apxj7bvq2-stdenv-bootstrap-tools
$ sha256sum /nix/store/sxc61dx6sng17lpp2rvv1q2apxj7bvq2-stdenv-bootstrap-tools/on-server/*
63041266fcdb3a8db03829dc06c9e969ca3b660f755101c4950530798fdac454 /nix/store/sxc61dx6sng17lpp2rvv1q2apxj7bvq2-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz
77593ef6c27aa4a8272799f046427864b3359871de64a3f7fba6dd5e2b7f12d8 /nix/store/sxc61dx6sng17lpp2rvv1q2apxj7bvq2-stdenv-bootstrap-tools/on-server/unpack.nar.xz
$ aws s3 cp --recursive --acl public-read /nix/store/sxc61dx6sng17lpp2rvv1q2apxj7bvq2-stdenv-bootstrap-tools/on-server/ s3://nixpkgs-tarballs/stdenv/aarch64-apple-darwin/d03ae62edd9402b6ee0471cb1543e1e19585025e
upload: ../../../../nix/store/sxc61dx6sng17lpp2rvv1q2apxj7bvq2-stdenv-bootstrap-tools/on-server/unpack.nar.xz to s3://nixpkgs-tarballs/stdenv/aarch64-apple-darwin/d03ae62edd9402b6ee0471cb1543e1e19585025e/unpack.nar.xz
upload: ../../../../nix/store/sxc61dx6sng17lpp2rvv1q2apxj7bvq2-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz to s3://nixpkgs-tarballs/stdenv/aarch64-apple-darwin/d03ae62edd9402b6ee0471cb1543e1e19585025e/bootstrap-tools.tar.xz
$ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/aarch64-apple-darwin/d03ae62edd9402b6ee0471cb1543e1e19585025e ./
download: s3://nixpkgs-tarballs/stdenv/aarch64-apple-darwin/d03ae62edd9402b6ee0471cb1543e1e19585025e/unpack.nar.xz to ./unpack.nar.xz
download: s3://nixpkgs-tarballs/stdenv/aarch64-apple-darwin/d03ae62edd9402b6ee0471cb1543e1e19585025e/bootstrap-tools.tar.xz to ./bootstrap-tools.tar.xz
$ sha256sum bootstrap-tools.tar.xz unpack.nar.xz
63041266fcdb3a8db03829dc06c9e969ca3b660f755101c4950530798fdac454 bootstrap-tools.tar.xz
77593ef6c27aa4a8272799f046427864b3359871de64a3f7fba6dd5e2b7f12d8 unpack.nar.xz
$ nix-store --realize /nix/store/z2gdi0ha3w9scbgl3jv6431hd52d4b3j-stdenv-bootstrap-tools
this path will be fetched (90.25 MiB download, 298.00 MiB unpacked):
/nix/store/z2gdi0ha3w9scbgl3jv6431hd52d4b3j-stdenv-bootstrap-tools
copying path '/nix/store/z2gdi0ha3w9scbgl3jv6431hd52d4b3j-stdenv-bootstrap-tools' from 'https://cache.nixos.org'...
warning: you did not specify '--add-root'; the result might be removed by the garbage collector
/nix/store/z2gdi0ha3w9scbgl3jv6431hd52d4b3j-stdenv-bootstrap-tools
$ sha256sum /nix/store/z2gdi0ha3w9scbgl3jv6431hd52d4b3j-stdenv-bootstrap-tools/on-server/*
5d44af17dea8350954b9b6daa8c2883bcb2f2f1633c1987d264b20032091cb3d /nix/store/z2gdi0ha3w9scbgl3jv6431hd52d4b3j-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz
9d863677c42daffc1a7b2d9f775debd37b9ab4804d167a2d56f61c3f80d28dc4 /nix/store/z2gdi0ha3w9scbgl3jv6431hd52d4b3j-stdenv-bootstrap-tools/on-server/unpack.nar.xz
$ aws s3 cp --recursive --acl public-read /nix/store/z2gdi0ha3w9scbgl3jv6431hd52d4b3j-stdenv-bootstrap-tools/on-server/ s3://nixpkgs-tarballs/stdenv/x86_64-apple-darwin/d03ae62edd9402b6ee0471cb1543e1e19585025e
upload: ../../../../nix/store/z2gdi0ha3w9scbgl3jv6431hd52d4b3j-stdenv-bootstrap-tools/on-server/unpack.nar.xz to s3://nixpkgs-tarballs/stdenv/x86_64-apple-darwin/d03ae62edd9402b6ee0471cb1543e1e19585025e/unpack.nar.xz
upload: ../../../../nix/store/z2gdi0ha3w9scbgl3jv6431hd52d4b3j-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz to s3://nixpkgs-tarballs/stdenv/x86_64-apple-darwin/d03ae62edd9402b6ee0471cb1543e1e19585025e/bootstrap-tools.tar.xz
$ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/x86_64-apple-darwin/d03ae62edd9402b6ee0471cb1543e1e19585025e ./
download: s3://nixpkgs-tarballs/stdenv/x86_64-apple-darwin/d03ae62edd9402b6ee0471cb1543e1e19585025e/unpack.nar.xz to ./unpack.nar.xz
download: s3://nixpkgs-tarballs/stdenv/x86_64-apple-darwin/d03ae62edd9402b6ee0471cb1543e1e19585025e/bootstrap-tools.tar.xz to ./bootstrap-tools.tar.xz
$ sha256sum bootstrap-tools.tar.xz unpack.nar.xz
5d44af17dea8350954b9b6daa8c2883bcb2f2f1633c1987d264b20032091cb3d bootstrap-tools.tar.xz
9d863677c42daffc1a7b2d9f775debd37b9ab4804d167a2d56f61c3f80d28dc4 unpack.nar.xz |
Author
|
thanks! |
ghost
mentioned this pull request
Author
|
reverting due to xz vulnerability included in the tools. |
ghost
mentioned this pull request
13 tasks
13 tasks
This pull request was closed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
DYLD_LIBRARY_PATHtesting:
how to request a seed update
once tools are uploaded will switch to ready to review so the PR doesn't get merged prematurely.
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.