From 2d3797be842dbbc1e765b3f4370a0cf74a565994 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Oct 2023 16:22:41 +0000
Subject: [PATCH 1/3] build(deps): bump styfle/cancel-workflow-action from
 0.11.0 to 0.12.0

Bumps [styfle/cancel-workflow-action](https://github.com/styfle/cancel-workflow-action) from 0.11.0 to 0.12.0.
- [Release notes](https://github.com/styfle/cancel-workflow-action/releases)
- [Commits](https://github.com/styfle/cancel-workflow-action/compare/0.11.0...0.12.0)

---
updated-dependencies:
- dependency-name: styfle/cancel-workflow-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/workflow.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
index 90f301a3..48336fff 100644
--- a/.github/workflows/workflow.yaml
+++ b/.github/workflows/workflow.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: cancel running workflows
-        uses: styfle/cancel-workflow-action@0.11.0
+        uses: styfle/cancel-workflow-action@0.12.0
         with:
           access_token: ${{ github.token }}
   test-nixpkgs:

From 5200c9b627e4f0c6c8206cf68e58d7dc58667ea8 Mon Sep 17 00:00:00 2001
From: Claudio Bley <claudio.bley@tweag.io>
Date: Wed, 25 Oct 2023 14:35:09 +0200
Subject: [PATCH 2/3] Add clang resource share directory to search path

This is needed e.g. when using `-fsanitize=address` which would otherwise fail with:
```
this rule is missing dependency declarations for the following files included by ...
 '/nix/store/9k6s3zmhj2pvkg8a5s8n7d2sbpffv8hv-clang-wrapper-16.0.1/resource-root/share/asan_ignorelist.txt'
```

Fixes #430
---
 toolchains/cc/cc.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/toolchains/cc/cc.nix b/toolchains/cc/cc.nix
index 77725e1a..da7f21ae 100644
--- a/toolchains/cc/cc.nix
+++ b/toolchains/cc/cc.nix
@@ -143,6 +143,12 @@ pkgs.runCommand "bazel-${cc.orignalName or cc.name}-toolchain"
         | xargs -0 -r realpath -ms
     }
     CXX_BUILTIN_INCLUDE_DIRECTORIES=($({
+      if is_compiler_option_supported -print-resource-dir; then
+        resource_dir="$( $cc -print-resource-dir )"
+        if [ -d "$resource_dir/share" ]; then
+          echo "$resource_dir/share"
+        fi
+      fi
       include_dirs_for c
       include_dirs_for c++
       if is_compiler_option_supported -fno-canonical-system-headers; then

From e83f3447141ec8e17e536ff4d0107d774caf3594 Mon Sep 17 00:00:00 2001
From: Stewart Butler <sbutler@aviatrix.com>
Date: Tue, 19 Sep 2023 16:33:01 -0700
Subject: [PATCH 3/3] Add support for Go 1.21

Go 1.21 added a requirement for a 'go.env' file. Without that file, Go
will throw an error like:
```
Error in fail: failed to fetch org_golang_google_grpc_cmd_protoc_gen_go_grpc: fetch_repo: google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.3.0: GOPROXY list is not the empty string, but contains no entries
```

This commit adds it to the SDK exposed by rules_nixpkgs so that it is
compatible with rules_go.

See:
- https://github.com/bazelbuild/rules_go/issues/3665
- https://github.com/bazelbuild/rules_go/pull/3666
---
 toolchains/go/go.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchains/go/go.nix b/toolchains/go/go.nix
index f559c356..b21eeb32 100644
--- a/toolchains/go/go.nix
+++ b/toolchains/go/go.nix
@@ -21,7 +21,7 @@ let
     paths = [ goAttr ];
     postBuild = ''
       touch $out/ROOT
-      ln -s $out/share/go/{api,doc,lib,misc,pkg,src} $out/
+      ln -s $out/share/go/{api,doc,lib,misc,pkg,src,go.env} $out/
     '';
   } // {
     version = getVersion goAttr;