Skip to content

pkgs/stdenv/linux: update i686-unknown-linux-gnu bootstrap-files#284542

Merged
lovesegfault merged 1 commit intoNixOS:stagingfrom
trofi:i686-linux-bootstrap-update
Jan 30, 2024
Merged

pkgs/stdenv/linux: update i686-unknown-linux-gnu bootstrap-files#284542
lovesegfault merged 1 commit intoNixOS:stagingfrom
trofi:i686-linux-bootstrap-update

Conversation

@trofi
Copy link
Contributor

@trofi trofi commented Jan 28, 2024

sha256sum of files to be uploaded:

$ sha256sum /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/* 293021dedf7568932230effb3453a3533e9f5c8f48bbe1fb72e383ade5b3f4df /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz d5bffc3231c9f95699ee34118e26bc788e09c608735e5edb2b433057011fddd1 /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/busybox

Suggested commands to upload files to 'tarballs.nixos.org':

$ nix-store --realize /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools
$ aws s3 cp --recursive --acl public-read /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/ s3://nixpkgs-tarballs/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d
$ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d ./
$ sha256sum bootstrap-tools.tar.xz busybox
$ sha256sum /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/*

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

sha256sum of files to be uploaded:

$ sha256sum /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/*
293021dedf7568932230effb3453a3533e9f5c8f48bbe1fb72e383ade5b3f4df  /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz
d5bffc3231c9f95699ee34118e26bc788e09c608735e5edb2b433057011fddd1  /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/busybox

Suggested commands to upload files to 'tarballs.nixos.org':

    $ nix-store --realize /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools
    $ aws s3 cp --recursive --acl public-read /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/ s3://nixpkgs-tarballs/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d
    $ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d ./
    $ sha256sum bootstrap-tools.tar.xz busybox
    $ sha256sum /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/*
@trofi
Copy link
Contributor Author

trofi commented Jan 28, 2024

It's an update create by this update script: #284541

@trofi
Copy link
Contributor Author

trofi commented Jan 28, 2024

Tested the build of hello and mc on x86_64-linux and i686-linux.

@lovesegfault WDYT of generating PRs like this one for occasional bootstrap files updates? Generated with #284541 . If the general form is fine we can tweak the specifics of the output and test it on this update.

The i686 bootstrap files update itself is useful to fix 32-bit file api bugs: #253274

@lovesegfault
Copy link
Member

@lovesegfault WDYT of generating PRs like this one for occasional bootstrap files updates? Generated with #284541 . If the general form is fine we can tweak the specifics of the output and test it on this update.

This looks great!

Files are uploaded:

$ sha256sum /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/*
293021dedf7568932230effb3453a3533e9f5c8f48bbe1fb72e383ade5b3f4df  /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz
d5bffc3231c9f95699ee34118e26bc788e09c608735e5edb2b433057011fddd1  /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/busybox

$ aws s3 cp --recursive --acl public-read /nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/ s3://nixpkgs-tarballs/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d 
upload: ../../../../../nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/busybox to s3://nixpkgs-tarballs/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d/busybox
upload: ../../../../../nix/store/5x6dldhza7if5s6wsicaxa8fbndyixps-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz to s3://nixpkgs-tarballs/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d/bootstrap-tools.tar.xz

$ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d ./
download: s3://nixpkgs-tarballs/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d/busybox to ./busybox
download: s3://nixpkgs-tarballs/stdenv/i686-unknown-linux-gnu/125cefd4cf8f857e5ff1aceaef9230ba578a033d/bootstrap-tools.tar.xz to ./bootstrap-tools.tar.xz

$ sha256sum bootstrap-tools.tar.xz busybox
293021dedf7568932230effb3453a3533e9f5c8f48bbe1fb72e383ade5b3f4df  bootstrap-tools.tar.xz
d5bffc3231c9f95699ee34118e26bc788e09c608735e5edb2b433057011fddd1  busybox

@lovesegfault
Copy link
Member

@ofborg eval

@trofi
Copy link
Contributor Author

trofi commented Jan 29, 2024

The eval seems to have failed tor a nix-2.3 own testsuite flake:

ran test tests/add.sh... [FAIL]
    ++ nix-store --add ./dummy
    + path1=/build/nix-test/add/store/g1qxg63zbanhv79ibby90311521d4237-dummy
    + echo /build/nix-test/add/store/g1qxg63zbanhv79ibby90311521d4237-dummy
    /build/nix-test/add/store/g1qxg63zbanhv79ibby90311521d4237-dummy
    ++ nix-store --add-fixed sha256 --recursive ./dummy
    + path2=/build/nix-test/add/store/n7knm3rma6fckrfwkx2vkiql3d1rgs1i-dummy
    + echo /build/nix-test/add/store/n7knm3rma6fckrfwkx2vkiql3d1rgs1i-dummy
    /build/nix-test/add/store/n7knm3rma6fckrfwkx2vkiql3d1rgs1i-dummy
    + test /build/nix-test/add/store/g1qxg63zbanhv79ibby90311521d4237-dummy '!=' /build/nix-test/add/store/n7knm3rma6fckrfwkx2vkiql3d1rgs1i-dummy
    + echo 'nix-store --add and --add-fixed mismatch'
    nix-store --add and --add-fixed mismatch
    + exit 1
make: *** [mk/lib.mk:128: tests/add.sh.test] Error 1
make: *** Waiting for unfinished jobs....
...
error: builder for '/nix/store/9522170cyhvncr33dyvyll6bk8q9fba3-nix-2.3.17.drv' failed with exit code 2;
error: 1 dependencies of derivation '/nix/store/1fip0bz4mgjmsvjasi3zwngfck8ihm9v-nixpkgs-lib-tests-nix-2.3.17.drv' failed to build

Possibly due to racy test suite attempting to write to ./dummy from multiple tests.

trofi added a commit to trofi/nixpkgs that referenced this pull request Jan 29, 2024
Without the change the evals fail frequently against `staging` when
`stdenv` rebbuilds `nix-2.3`. Recent example is NixOS#284542

Let's backport the patch until new `nix-2.3` release is cut.
@trofi
Copy link
Contributor Author

trofi commented Jan 29, 2024

I think these two tests are racy against dummy file contents:

tests/add.sh:path1=$(nix-store --add ./dummy)

tests/check.sh:echo -n > ./dummy
tests/check.sh:echo 'Hello World' > ./dummy

tests/init.sh:echo 'Hello World' > ./dummy

I was fixed in a few commits a while ago: NixOS/nix@02dd6bb, NixOS/nix@08dcd22

And was backported to 2.3 branch in NixOS/nix@0776aa1 2 weeks ago. Next release should make the test less flaky.

@lovesegfault lovesegfault merged commit f228f37 into NixOS:staging Jan 30, 2024
@trofi trofi deleted the i686-linux-bootstrap-update branch January 30, 2024 09:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: stdenv Standard environment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

Comments