-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
stdenv: update ARM bootstrap tarballs #82051
Conversation
ehh....
|
The |
url = https://hydra.nixos.org/build/112609163/download/2/busybox; | ||
sha256 = "0dc5471dc6a5f69ad98eb7445f51a61e88aa5792d7a677025bf012bdb513b763"; | ||
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest | ||
# from build: https://hydra.nixos.org/build/113692702 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The build url in the comment is the same for all three architectures, and points to an armv7l build.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hah... uh .... :)
The name of the
Adding |
My suggested changes: diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
index e8da070c397..18a94fb1b40 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel.nix
@@ -3,14 +3,15 @@
# infrastructure team to mirror the job.
busybox = import <nix/fetchurl.nix> {
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest
- # from build: https://hydra.nixos.org/build/113692702
+ # from build: https://hydra.nixos.org/build/114081916
+ name = "busybox";
url = https://tarballs.nixos.org/sha256/3091d8e22778d023d51c50526ac4911b617db38b7f092fa3332c1d3ff5bd53b7;
- sha256 = "3091d8e22778d023d51c50526ac4911b617db38b7f092fa3332c1d3ff5bd53b7";
+ sha256 = "0qxp2fsvs4phbc17g9npj9bsm20ylr8myi5pivcrmxm5qqflgi8d";
executable = true;
};
bootstrapTools = import <nix/fetchurl.nix> {
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest
- # from build: https://hydra.nixos.org/build/113692702
+ # from build: https://hydra.nixos.org/build/114081916
url = https://tarballs.nixos.org/sha256/16c307ce6d22166f2da506744caf90fcb529e3cbd003da57bcd8c1c3812ebfd7;
sha256 = "16c307ce6d22166f2da506744caf90fcb529e3cbd003da57bcd8c1c3812ebfd7";
};
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
index 8541091ded1..eac1fa32b90 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv6l.nix
@@ -3,14 +3,15 @@
# infrastructure team to mirror the job.
busybox = import <nix/fetchurl.nix> {
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest
- # from build: https://hydra.nixos.org/build/113692702
+ # from build: https://hydra.nixos.org/build/114081910
+ name = "busybox";
url = https://tarballs.nixos.org/sha256/d96c7656bf43e9ab24949a0b7f6c7c4a4daf1f89ce10ea6e86aa645cbff65bce;
- sha256 = "d96c7656bf43e9ab24949a0b7f6c7c4a4daf1f89ce10ea6e86aa645cbff65bce";
+ sha256 = "1q02537cq56wlaxbz3s3kj5vmh6jbm27jhvga6b4m4jycz5sxxp6";
executable = true;
};
bootstrapTools = import <nix/fetchurl.nix> {
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest
- # from build: https://hydra.nixos.org/build/113692702
+ # from build: https://hydra.nixos.org/build/114081910
url = https://tarballs.nixos.org/sha256/787ce488369504c29c57e36dd25eaf84e8cc8423d9f3da7359daa0023aaafb99;
sha256 = "787ce488369504c29c57e36dd25eaf84e8cc8423d9f3da7359daa0023aaafb99";
};
diff --git a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
index c788b1e436c..be69dd4ca69 100644
--- a/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
+++ b/pkgs/stdenv/linux/bootstrap-files/armv7l.nix
@@ -3,14 +3,15 @@
# infrastructure team to mirror the job.
busybox = import <nix/fetchurl.nix> {
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l.dist/latest
- # from build: https://hydra.nixos.org/build/113692702
+ # from build: https://hydra.nixos.org/build/114081942
+ name = "busybox";
url = https://tarballs.nixos.org/sha256/7a7a0266d4687eb1b44496d4d185b9ffa9b1c6260c5df1c40a4999c612312bbd;
- sha256 = "7a7a0266d4687eb1b44496d4d185b9ffa9b1c6260c5df1c40a4999c612312bbd";
+ sha256 = "18qc6w2yykh7nvhjklsqb2zb3fjh4p9r22nvmgj32jr1mjflcsjn";
executable = true;
};
bootstrapTools = import <nix/fetchurl.nix> {
# from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv7l.dist/latest
- # from build: https://hydra.nixos.org/build/113692702
+ # from build: https://hydra.nixos.org/build/114081942
url = https://tarballs.nixos.org/sha256/c727c21ebb863f6e8e88cfef73f4ddb534ae942df1a0f9d2e1d1825b6f843a86;
sha256 = "c727c21ebb863f6e8e88cfef73f4ddb534ae942df1a0f9d2e1d1825b6f843a86";
}; |
I applied @thefloweringash's changes and rebased on staging (to get the unpack-boostrap-tools fix), and I am building stdenv for armv7l and armv6l to make sure this still works. |
I've successfully built up to |
Oh I see; I assumed staging hadn't been merged yet. I'll build it for armv6l then. |
I've verified the tarballs contents match their hash and correspond to the named builds. ✅ Without |
This comment has been minimized.
This comment has been minimized.
Nitpick: is the URL style intentionally different from the other stdenv-bootstrap tarballs? Those have e.g.
(where the hash is for nixpkgs git commit, not for contents) |
Not different on purpose, but I'm feeling too tired today to follow the (new-to-me) directions properly. Can you give me specific instructions? We need to do that before we merge this. |
I have no idea about reasons for the style... so your If we were to follow the style currently used for x86_64, I believe the URLs would be:
I'm not sure why we typically use http://tarballs.nixos.org. I'd expect https:// to be preferable nowadays, but I don't feel strongly about this case. |
|
I see there's now a Hydra machine and a jobset for |
I have successfully built |
Updated to use the new URLs from @vcunat (thank you for the hard-to-mistake instructions :).) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm still new here, so maybe there's a valid reason you're not following RFC 45. If there is, feel free to disregard this review (though I would like to hear an explanation so I can keep it in mind for the future).
I need reviews on two things: First, validate that for each URL, the string between Second, clone the repo and: |
Co-authored-by: Cole Helbling <[email protected]>
I can confirm that URL's are correct. After running
|
I believe this MR should be picked to |
If this is backported, make sure #79793 is as well. |
It would be great to have this backported |
stdenv: update ARM bootstrap tarballs
Combination of NixOS#79793 and NixOS#82051
Motivation for this change
follow-up to #79793
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)