From 1697a3275becc29d0c002f6ef18bd63885b4d758 Mon Sep 17 00:00:00 2001
From: Malte Poll <1780588+malt3@users.noreply.github.com>
Date: Wed, 8 May 2024 16:06:12 +0200
Subject: [PATCH] fix: coreutils toolchain: Use statically linked linux amd64
 variant (#706)

* coreutils toolchain: Use statically linked linux amd64 variant

Uutils has a musl release artifact for linux amd64.
In the future, it should probably also be possible to add a
aarch64 musl toolchain. At the moment, this is not an upstream release
artifact.

* coreutils toolchain: temporarily add back old darwin variant

On release 0.0.26 of uutils/coreutils, the darwin x86_64 binary is missing.
Also, any releases between 0.0.23 and 0.0.26 are missing binary artifacts.
Downgrade coreutils toolchain on darwin x86_64 for now.

https://github.com/uutils/coreutils/releases/tag/0.0.26
---
 docs/repositories.md                |  2 +-
 lib/private/coreutils_toolchain.bzl | 20 ++++++++++----------
 tools/coreutils_mirror_release.sh   |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/repositories.md b/docs/repositories.md
index 65ffe07..c33f66d 100644
--- a/docs/repositories.md
+++ b/docs/repositories.md
@@ -108,7 +108,7 @@ Registers coreutils toolchain and repositories
 | Name  | Description | Default Value |
 | :------------- | :------------- | :------------- |
 | <a id="register_coreutils_toolchains-name"></a>name |  override the prefix for the generated toolchain repositories   |  <code>"coreutils"</code> |
-| <a id="register_coreutils_toolchains-version"></a>version |  the version of coreutils to execute (see https://github.com/uutils/coreutils/releases)   |  <code>"0.0.23"</code> |
+| <a id="register_coreutils_toolchains-version"></a>version |  the version of coreutils to execute (see https://github.com/uutils/coreutils/releases)   |  <code>"0.0.26"</code> |
 | <a id="register_coreutils_toolchains-register"></a>register |  whether to call through to native.register_toolchains. Should be True for WORKSPACE users, but false when used under bzlmod extension   |  <code>True</code> |
 
 
diff --git a/lib/private/coreutils_toolchain.bzl b/lib/private/coreutils_toolchain.bzl
index ba7d026..9bdaade 100644
--- a/lib/private/coreutils_toolchain.bzl
+++ b/lib/private/coreutils_toolchain.bzl
@@ -34,33 +34,33 @@ COREUTILS_PLATFORMS = {
     ),
 }
 
-DEFAULT_COREUTILS_VERSION = "0.0.23"
+DEFAULT_COREUTILS_VERSION = "0.0.26"
 
 # https://github.com/uutils/coreutils/releases
 #
 # The integrity hashes can be automatically fetched for the coreutils releases by running
 # `tools/coreutils_mirror_release.sh`.
 COREUTILS_VERSIONS = {
-    "0.0.23": {
+    "0.0.26": {
         "darwin_arm64": {
-            "filename": "coreutils-0.0.23-aarch64-apple-darwin.tar.gz",
-            "sha256": "sha256-KP90sjKxtXDbLC+o5f4+gQnvP3Tr7O0RopME4g9QF5E=",
+            "filename": "coreutils-0.0.26-aarch64-apple-darwin.tar.gz",
+            "sha256": "sha256-/A6CNYWmvOwPW443pH+wO+VtzDFgussN1hRGuANnFOU="
         },
         "linux_arm64": {
-            "filename": "coreutils-0.0.23-aarch64-unknown-linux-gnu.tar.gz",
-            "sha256": "sha256-8wMVMgAgf8JQ2+2LdoewkyDo416VEsf9RlMJl4jiBjk=",
+            "filename": "coreutils-0.0.26-aarch64-unknown-linux-musl.tar.gz",
+            "sha256": "sha256-9zGLFOMDjUDbraDY/hrE5zFJ0O+QYrvx2wHk3Gw3q/A="
         },
         "darwin_amd64": {
             "filename": "coreutils-0.0.23-x86_64-apple-darwin.tar.gz",
             "sha256": "sha256-SswetVAuK/hMK1r9uBvNnKj5JpSgD0bzkbsHTxOabCo=",
         },
         "windows_amd64": {
-            "filename": "coreutils-0.0.23-x86_64-pc-windows-msvc.zip",
-            "sha256": "sha256-aglIj5JvFGLm2ABwRzWAsZRTTD3X444V3GxHM9pGJS4=",
+            "filename": "coreutils-0.0.26-x86_64-pc-windows-msvc.zip",
+            "sha256": "sha256-6qPkqxQZM4XBBBJ80t1uvzfZiz0gBeT/zoCdfqOO3uk="
         },
         "linux_amd64": {
-            "filename": "coreutils-0.0.23-x86_64-unknown-linux-gnu.tar.gz",
-            "sha256": "sha256-u7OMW43Y46aXRRIKULfKdfUW51WJn6G70s5Xxwb6/1g=",
+            "filename": "coreutils-0.0.26-x86_64-unknown-linux-musl.tar.gz",
+            "sha256": "sha256-QpGVp3wmHqpt5Brd/bdj7pyMQNftcihOtaRI8z2uhp0=",
         },
     },
 }
diff --git a/tools/coreutils_mirror_release.sh b/tools/coreutils_mirror_release.sh
index 4efb506..5b3a681 100755
--- a/tools/coreutils_mirror_release.sh
+++ b/tools/coreutils_mirror_release.sh
@@ -11,7 +11,7 @@ JQ_FILTER='map({
             (.name | contains("i686") | not) and
             (
                 ( (.name | contains("windows")) and (.name | contains("gnu") | not) ) or
-                ( (.name | contains("windows") | not) and (.name | contains("gnu") ) and (.name | contains("gnueabihf") | not) ) or
+                ( .name | contains("musl") ) or
                 ( .name | contains("darwin") )
             )
         ))
@@ -27,7 +27,7 @@ JQ_FILTER='map({
                 sub("aarch64"; "arm64") |
                 gsub("\\d+.\\d+.\\d+-"; "") |
                 rtrimstr("-msvc") |
-                rtrimstr("-gnu") |
+                rtrimstr("-musl") |
                 split("-") |
                 reverse |
                 join("_"),