From ffe685b3e0187a60c792ab942600b349735fd6d9 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 10 Dec 2024 23:22:07 +0100 Subject: [PATCH 1/4] pkgs/stdenv/linux: update armv5tel-unknown-linux-gnueabi bootstrap-files sha256sum of files to be uploaded: $ sha256sum /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi/on-server/* fbb71d2944e184e6f8a551418cf585a416d37e7eb803f7b39199cfea11213113 /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi/on-server/bootstrap-tools.tar.xz 90dff34c05771333bd1c95c9eb2017b15da428937aed3cbf91677f09469d11ad /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi/on-server/busybox Suggested commands to upload files to 'tarballs.nixos.org': $ nix-store --realize /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi $ aws s3 cp --recursive --acl public-read /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi/on-server/ s3://nixpkgs-tarballs/stdenv/armv5tel-unknown-linux-gnueabi/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1 $ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/armv5tel-unknown-linux-gnueabi/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1 ./ $ sha256sum bootstrap-tools.tar.xz busybox $ sha256sum /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi/on-server/* --- .../armv5tel-unknown-linux-gnueabi.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix b/pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix index 0ac818b9f223..f608581568b5 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv5tel-unknown-linux-gnueabi.nix @@ -1,18 +1,21 @@ +# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: +# $ ./refresh-tarballs.bash --targets=armv5tel-unknown-linux-gnueabi +# +# Metadata: +# - nixpkgs revision: 029dea9aaacf920ce8f7d89e4cf09da31a38d8e1 +# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel-unknown-linux-gnueabi.build/latest +# - resolved hydra build: https://hydra.nixos.org/build/281086357 +# - instantiated derivation: /nix/store/j44ipis8k634n1a6j9j1blff88w13ix9-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi.drv +# - output directory: /nix/store/7xapg8fj3p2fpmnppsd28a66q62vzdg1-stdenv-bootstrap-tools-armv5tel-unknown-linux-gnueabi +# - build time: Tue, 03 Dec 2024 13:59:40 +0000 { - # Note: do not use Hydra as a source URL. Ask a member of the - # infrastructure team to mirror the job. + bootstrapTools = import { + url = "http://tarballs.nixos.org/stdenv/armv5tel-unknown-linux-gnueabi/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/bootstrap-tools.tar.xz"; + hash = "sha256-+7cdKUThhOb4pVFBjPWFpBbTfn64A/ezkZnP6hEhMRM="; + }; busybox = import { - # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest - # from build: https://hydra.nixos.org/build/114203025 - url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox"; - # note: the following hash is different than the above hash, due to executable = true - sha256 = "0qxp2fsvs4phbc17g9npj9bsm20ylr8myi5pivcrmxm5qqflgi8d"; + url = "http://tarballs.nixos.org/stdenv/armv5tel-unknown-linux-gnueabi/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/busybox"; + hash = "sha256-vZ3oSKUjGVcx2TJsrKmTX4d+3S4/flD780vFVaaHDGI="; executable = true; }; - bootstrapTools = import { - # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv5tel.dist/latest - # from build: https://hydra.nixos.org/build/114203025 - url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz"; - sha256 = "28327343db5ecc7f7811449ec69280d5867fa5d1d377cab0426beb9d4e059ed6"; - }; } From a2d3d00fb0acdb9bfc7b115f0bfd05528fb6678b Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Tue, 10 Dec 2024 23:22:18 +0100 Subject: [PATCH 2/4] pkgs/stdenv/linux: update armv6l-unknown-linux-gnueabihf bootstrap-files sha256sum of files to be uploaded: $ sha256sum /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf/on-server/* 20e6514c946fa0fd1b233e4623a1aa18061bfc574c13ec55572153be0b662eec /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf/on-server/bootstrap-tools.tar.xz dc73ddacf019a38669921f1c58c3adeaac290c2988cd54fc39f968c805d521a8 /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf/on-server/busybox Suggested commands to upload files to 'tarballs.nixos.org': $ nix-store --realize /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf $ aws s3 cp --recursive --acl public-read /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf/on-server/ s3://nixpkgs-tarballs/stdenv/armv6l-unknown-linux-gnueabihf/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1 $ aws s3 cp --recursive s3://nixpkgs-tarballs/stdenv/armv6l-unknown-linux-gnueabihf/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1 ./ $ sha256sum bootstrap-tools.tar.xz busybox $ sha256sum /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf/on-server/* --- .../armv6l-unknown-linux-gnueabihf.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix index 8bc99c64c681..8bef180f3b69 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv6l-unknown-linux-gnueabihf.nix @@ -1,18 +1,21 @@ +# Autogenerated by maintainers/scripts/bootstrap-files/refresh-tarballs.bash as: +# $ ./refresh-tarballs.bash --targets=armv6l-unknown-linux-gnueabihf +# +# Metadata: +# - nixpkgs revision: 029dea9aaacf920ce8f7d89e4cf09da31a38d8e1 +# - hydra build: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l-unknown-linux-gnueabihf.build/latest +# - resolved hydra build: https://hydra.nixos.org/build/281086894 +# - instantiated derivation: /nix/store/gq29b3av5mf7x9zlbvaf1qrvlnb1ps4l-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf.drv +# - output directory: /nix/store/cwfvh58lcbyk26d34j1w26d3ladgcgn8-stdenv-bootstrap-tools-armv6l-unknown-linux-gnueabihf +# - build time: Tue, 03 Dec 2024 13:59:47 +0000 { - # Note: do not use Hydra as a source URL. Ask a member of the - # infrastructure team to mirror the job. + bootstrapTools = import { + url = "http://tarballs.nixos.org/stdenv/armv6l-unknown-linux-gnueabihf/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/bootstrap-tools.tar.xz"; + hash = "sha256-IOZRTJRvoP0bIz5GI6GqGAYb/FdME+xVVyFTvgtmLuw="; + }; busybox = import { - # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest - # from build: https://hydra.nixos.org/build/114202834 - url = "http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/busybox"; - # note: the following hash is different than the above hash, due to executable = true - sha256 = "1q02537cq56wlaxbz3s3kj5vmh6jbm27jhvga6b4m4jycz5sxxp6"; + url = "http://tarballs.nixos.org/stdenv/armv6l-unknown-linux-gnueabihf/029dea9aaacf920ce8f7d89e4cf09da31a38d8e1/busybox"; + hash = "sha256-kdlAOhgypLa+ZesRT1ZVDoDQdNefV1Rx5Yf7H254o80="; executable = true; }; - bootstrapTools = import { - # from job: https://hydra.nixos.org/job/nixpkgs/cross-trunk/bootstrapTools.armv6l.dist/latest - # from build: https://hydra.nixos.org/build/114202834 - url = "http://tarballs.nixos.org/stdenv-linux/armv6l/0eb0ddc4dbe3cd5415c6b6e657538eb809fc3778/bootstrap-tools.tar.xz"; - sha256 = "0810fe74f8cd09831f177d075bd451a66b71278d3cc8db55b07c5e38ef3fbf3f"; - }; } From 7b9726f12c6f457416df47f069149b8eec37d273 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 16 Dec 2024 12:22:14 +0100 Subject: [PATCH 3/4] pkgs/tools/text/diffutils: Disabled test-c-stack2 test-sigsegv-catch-stackoverflow1 and 2 on Aarch32 Those tests fail on qemu making it impossible to build on other architectures --- pkgs/tools/text/diffutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 6c1bc8bf01f1..f7fdecd93f91 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # Disable stack-related gnulib tests on x86_64-darwin because they have problems running under # Rosetta 2: test-c-stack hangs, test-sigsegv-catch-stackoverflow fails. - postPatch = if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) then '' + postPatch = if ((stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) || (stdenv.hostPlatform.isAarch32)) then '' sed -i -E 's:test-c-stack2?\.sh::g' gnulib-tests/Makefile.in sed -i -E 's:test-sigsegv-catch-stackoverflow[12]::g' gnulib-tests/Makefile.in '' else null; From 34d7324bcd66d1f8fd3e84ba25d33a6509d4c208 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 16 Dec 2024 12:24:35 +0100 Subject: [PATCH 4/4] pkgs/tools/text/gnugrep: Disabled tests for Aarch32 Some tests fail on qemu making it impossible to build on other architectures --- pkgs/tools/text/gnugrep/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index bbb876703f2b..98d471cca61e 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -32,7 +32,8 @@ stdenv.mkDerivation { # cygwin: FAIL: multibyte-white-space # freebsd: FAIL mb-non-UTF8-performance # x86_64-darwin: fails 'stack-overflow' tests on Rosetta 2 emulator - doCheck = !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isFreeBSD && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64; + # aarch32: fails 'stack-overflow' when run on qemu under x86_64 + doCheck = !stdenv.hostPlatform.isCygwin && !stdenv.hostPlatform.isFreeBSD && !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) && !stdenv.buildPlatform.isRiscV64 && !stdenv.hostPlatform.isAarch32; # On macOS, force use of mkdir -p, since Grep's fallback # (./install-sh) is broken.