From b0e29d1b30fc0d14e82bb28d760721fd91e5edc2 Mon Sep 17 00:00:00 2001
From: Andrei Vagin <avagin@gmail.com>
Date: Wed, 10 Jan 2024 09:47:13 -0800
Subject: [PATCH] bazel: Update packages

---
 WORKSPACE                    | 20 ++++++++++----------
 tools/rules_go_sdk.patch     | 11 +++++------
 tools/rules_go_symbols.patch | 12 ++++++------
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index bc0833aaa..ce2b5cb01 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -15,10 +15,10 @@ http_file(
 # Bazel/starlark utilities.
 http_archive(
     name = "bazel_skylib",
-    sha256 = "b8a1527901774180afc798aeb28c4634bdccf19c4d98e7bdd1ce79d1fe9aaad7",
+    sha256 = "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
-        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.4.1/bazel-skylib-1.4.1.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
     ],
 )
 
@@ -52,10 +52,10 @@ http_archive(
         # Allow for patching of the go_sdk.
         "//tools:rules_go_sdk.patch",
     ],
-    sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3",
+    sha256 = "7c76d6236b28ff695aa28cf35f95de317a9472fd1fb14ac797c9bf684f09b37c",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.44.2/rules_go-v0.44.2.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.44.2/rules_go-v0.44.2.zip",
     ],
 )
 
@@ -76,10 +76,10 @@ switched_rules_by_language(
 
 http_archive(
     name = "bazel_gazelle",
-    sha256 = "d3fa66a39028e97d76f9e2db8f1b0c11c099e8e01bf363a923074784e451f809",
+    sha256 = "32938bda16e6700063035479063d9d24c60eda8d79fd4739563f50d331cb3209",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz",
-        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.35.0/bazel-gazelle-v0.35.0.tar.gz",
+        "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.35.0/bazel-gazelle-v0.35.0.tar.gz",
     ],
 )
 
@@ -95,7 +95,7 @@ go_download_sdk(
     # time on our continuous integration.
     patch = "//tools:go_types_memoize.patch",
     patch_strip = 2,
-    version = "1.21.1",
+    version = "1.21.6",
 )
 
 gazelle_dependencies()
diff --git a/tools/rules_go_sdk.patch b/tools/rules_go_sdk.patch
index 3a6347eed..4f31ddede 100644
--- a/tools/rules_go_sdk.patch
+++ b/tools/rules_go_sdk.patch
@@ -1,7 +1,7 @@
 diff --git a/go/private/sdk.bzl b/go/private/sdk.bzl
 --- a/go/private/sdk.bzl
 +++ b/go/private/sdk.bzl
-@@ -130,6 +130,8 @@ def _go_download_sdk_impl(ctx):
+@@ -128,6 +128,8 @@ def _go_download_sdk_impl(ctx):
              "sdks": ctx.attr.sdks,
              "urls": ctx.attr.urls,
              "version": version,
@@ -10,16 +10,15 @@ diff --git a/go/private/sdk.bzl b/go/private/sdk.bzl
              "strip_prefix": ctx.attr.strip_prefix,
          }
      return None
-@@ -145,6 +147,8 @@ go_download_sdk_rule = repository_rule(
+@@ -143,6 +145,7 @@ go_download_sdk_rule = repository_rule(
          ),
          "urls": attr.string_list(default = ["https://dl.google.com/go/{}"]),
          "version": attr.string(),
 +        "patch": attr.label(default = None),
-+        "patch_strip": attr.int(default = 0),
          "strip_prefix": attr.string(default = "go"),
-         "_sdk_build_file": attr.label(
-             default = Label("//go/private:BUILD.sdk.bazel"),
-@@ -440,6 +444,8 @@ def _remote_sdk(ctx, urls, strip_prefix, sha256):
+         "patches": attr.label_list(
+             doc = "A list of patches to apply to the SDK after downloading it",
+@@ -453,6 +456,8 @@ def _remote_sdk(ctx, urls, strip_prefix, sha256):
          res = ctx.execute(["tar", "-xf", "go_sdk.tar.gz", "--strip-components=1"])
          if res.return_code:
              fail("error extracting Go SDK:\n" + res.stdout + res.stderr)
diff --git a/tools/rules_go_symbols.patch b/tools/rules_go_symbols.patch
index 46767f169..51e5f15ad 100644
--- a/tools/rules_go_symbols.patch
+++ b/tools/rules_go_symbols.patch
@@ -1,14 +1,14 @@
 diff --git a/go/private/rules/test.bzl b/go/private/rules/test.bzl
-index 17516ad7..76b6c68c 100644
+index 1283776a..bc868296 100644
 --- a/go/private/rules/test.bzl
 +++ b/go/private/rules/test.bzl
-@@ -117,9 +117,6 @@ def _go_test_impl(ctx):
+@@ -124,9 +124,6 @@ def _go_test_impl(ctx):
      )
-
+ 
      test_gc_linkopts = gc_linkopts(ctx)
 -    if not go.mode.debug:
 -        # Disable symbol table and DWARF generation for test binaries.
 -        test_gc_linkopts.extend(["-s", "-w"])
-
-     # Link in the run_dir global for bzltestutil
-     test_gc_linkopts.extend(["-X", "github.com/bazelbuild/rules_go/go/tools/bzltestutil.RunDir=" + run_dir])
+ 
+     # Link in the run_dir global for bzltestutil.
+     # We add "+initfirst/" to the package path so the package is initialized