From 7790cad1932619c0e4e025b52f4fc9d942e36e3a Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann@tweag.io>
Date: Wed, 1 Feb 2023 16:18:20 +0100
Subject: [PATCH 01/11] Update to Bazel version 6 in top-level

---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 1f57b0c5..586f07f2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
       {
         devShells.default = with pkgs; mkShell {
           name = "rules_nixpkgs_shell";
-          packages = [ bazel_5 bazel-buildtools cacert gcc nix git ];
+          packages = [ bazel_6 bazel-buildtools cacert gcc nix git ];
         };
       });
 }

From 3f2b10e6c7980ceac9daab6fa0489a88509a5abb Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann@tweag.io>
Date: Wed, 1 Feb 2023 16:27:21 +0100
Subject: [PATCH 02/11] update cc example to Bazel 6

---
 examples/toolchains/cc/nixpkgs.json | 6 +++---
 examples/toolchains/cc/nixpkgs.nix  | 1 -
 examples/toolchains/cc/shell.nix    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/toolchains/cc/nixpkgs.json b/examples/toolchains/cc/nixpkgs.json
index 52488744..2542221a 100644
--- a/examples/toolchains/cc/nixpkgs.json
+++ b/examples/toolchains/cc/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "owner": "NixOS",
   "repo": "nixpkgs",
-  "branch": "22.05",
-  "rev": "ce6aa13369b667ac2542593170993504932eb836",
-  "sha256": "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik"
+  "branch": "22.11",
+  "rev": "f413457e0dd7a42adefdbcea4391dd9751509025",
+  "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA="
 }
diff --git a/examples/toolchains/cc/nixpkgs.nix b/examples/toolchains/cc/nixpkgs.nix
index 120a30c3..6db312a3 100644
--- a/examples/toolchains/cc/nixpkgs.nix
+++ b/examples/toolchains/cc/nixpkgs.nix
@@ -1,5 +1,4 @@
 let
-  # nixpkgs 21.11
   spec = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
   nixpkgs = fetchTarball {
     url = "https://github.com/${spec.owner}/${spec.repo}/archive/${spec.rev}.tar.gz";
diff --git a/examples/toolchains/cc/shell.nix b/examples/toolchains/cc/shell.nix
index e84b5a81..a411bd03 100644
--- a/examples/toolchains/cc/shell.nix
+++ b/examples/toolchains/cc/shell.nix
@@ -1,3 +1,3 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_5 ]; }
+pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }

From 5d42f747706efeb828543013c799e6d93c265c1d Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann@tweag.io>
Date: Wed, 1 Feb 2023 16:28:28 +0100
Subject: [PATCH 03/11] Update cc_with_deps example to Bazel 6

---
 examples/toolchains/cc_with_deps/nixpkgs.json | 6 +++---
 examples/toolchains/cc_with_deps/nixpkgs.nix  | 1 -
 examples/toolchains/cc_with_deps/shell.nix    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/toolchains/cc_with_deps/nixpkgs.json b/examples/toolchains/cc_with_deps/nixpkgs.json
index 52488744..2542221a 100644
--- a/examples/toolchains/cc_with_deps/nixpkgs.json
+++ b/examples/toolchains/cc_with_deps/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "owner": "NixOS",
   "repo": "nixpkgs",
-  "branch": "22.05",
-  "rev": "ce6aa13369b667ac2542593170993504932eb836",
-  "sha256": "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik"
+  "branch": "22.11",
+  "rev": "f413457e0dd7a42adefdbcea4391dd9751509025",
+  "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA="
 }
diff --git a/examples/toolchains/cc_with_deps/nixpkgs.nix b/examples/toolchains/cc_with_deps/nixpkgs.nix
index 120a30c3..6db312a3 100644
--- a/examples/toolchains/cc_with_deps/nixpkgs.nix
+++ b/examples/toolchains/cc_with_deps/nixpkgs.nix
@@ -1,5 +1,4 @@
 let
-  # nixpkgs 21.11
   spec = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
   nixpkgs = fetchTarball {
     url = "https://github.com/${spec.owner}/${spec.repo}/archive/${spec.rev}.tar.gz";
diff --git a/examples/toolchains/cc_with_deps/shell.nix b/examples/toolchains/cc_with_deps/shell.nix
index e84b5a81..a411bd03 100644
--- a/examples/toolchains/cc_with_deps/shell.nix
+++ b/examples/toolchains/cc_with_deps/shell.nix
@@ -1,3 +1,3 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_5 ]; }
+pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }

From 85ae521caa7621edb8b937cc34812dba44ddbce1 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann@tweag.io>
Date: Wed, 1 Feb 2023 16:29:42 +0100
Subject: [PATCH 04/11] Update go example to Bazel 6

---
 examples/toolchains/go/nixpkgs.json | 6 +++---
 examples/toolchains/go/shell.nix    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/toolchains/go/nixpkgs.json b/examples/toolchains/go/nixpkgs.json
index 52488744..2542221a 100644
--- a/examples/toolchains/go/nixpkgs.json
+++ b/examples/toolchains/go/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "owner": "NixOS",
   "repo": "nixpkgs",
-  "branch": "22.05",
-  "rev": "ce6aa13369b667ac2542593170993504932eb836",
-  "sha256": "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik"
+  "branch": "22.11",
+  "rev": "f413457e0dd7a42adefdbcea4391dd9751509025",
+  "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA="
 }
diff --git a/examples/toolchains/go/shell.nix b/examples/toolchains/go/shell.nix
index e84b5a81..a411bd03 100644
--- a/examples/toolchains/go/shell.nix
+++ b/examples/toolchains/go/shell.nix
@@ -1,3 +1,3 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_5 ]; }
+pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }

From 79589daf97ba3e02e713e9975b9879e0376ff772 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann@tweag.io>
Date: Wed, 1 Feb 2023 16:34:41 +0100
Subject: [PATCH 05/11] Update Java example to Bazel 6

---
 examples/toolchains/java/nixpkgs.json | 6 +++---
 examples/toolchains/java/shell.nix    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/toolchains/java/nixpkgs.json b/examples/toolchains/java/nixpkgs.json
index be54b1e4..3ad9818d 100644
--- a/examples/toolchains/java/nixpkgs.json
+++ b/examples/toolchains/java/nixpkgs.json
@@ -1,8 +1,8 @@
 {
   "owner": "NixOS",
   "repo": "nixpkgs",
-  "branch": "22.05",
-  "rev": "ce6aa13369b667ac2542593170993504932eb836",
-  "sha256": "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik"
+  "branch": "22.11",
+  "rev": "f413457e0dd7a42adefdbcea4391dd9751509025",
+  "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA="
 }
 
diff --git a/examples/toolchains/java/shell.nix b/examples/toolchains/java/shell.nix
index e84b5a81..a411bd03 100644
--- a/examples/toolchains/java/shell.nix
+++ b/examples/toolchains/java/shell.nix
@@ -1,3 +1,3 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_5 ]; }
+pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }

From 32ae6e411747158cce67b35da1fb98f455e05459 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann@tweag.io>
Date: Wed, 1 Feb 2023 16:35:37 +0100
Subject: [PATCH 06/11] Update NodeJS example to Bazel 6

---
 examples/toolchains/nodejs/nixpkgs.json | 6 +++---
 examples/toolchains/nodejs/shell.nix    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/toolchains/nodejs/nixpkgs.json b/examples/toolchains/nodejs/nixpkgs.json
index 52488744..2542221a 100644
--- a/examples/toolchains/nodejs/nixpkgs.json
+++ b/examples/toolchains/nodejs/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "owner": "NixOS",
   "repo": "nixpkgs",
-  "branch": "22.05",
-  "rev": "ce6aa13369b667ac2542593170993504932eb836",
-  "sha256": "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik"
+  "branch": "22.11",
+  "rev": "f413457e0dd7a42adefdbcea4391dd9751509025",
+  "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA="
 }
diff --git a/examples/toolchains/nodejs/shell.nix b/examples/toolchains/nodejs/shell.nix
index e84b5a81..a411bd03 100644
--- a/examples/toolchains/nodejs/shell.nix
+++ b/examples/toolchains/nodejs/shell.nix
@@ -1,3 +1,3 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_5 ]; }
+pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }

From a1a8392d907b0a537791b879e3f4355fe5ff736d Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann@tweag.io>
Date: Wed, 1 Feb 2023 16:36:43 +0100
Subject: [PATCH 07/11] Update Python example to Bazel 6

---
 examples/toolchains/python/nixpkgs.json | 6 +++---
 examples/toolchains/python/shell.nix    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/toolchains/python/nixpkgs.json b/examples/toolchains/python/nixpkgs.json
index 52488744..2542221a 100644
--- a/examples/toolchains/python/nixpkgs.json
+++ b/examples/toolchains/python/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "owner": "NixOS",
   "repo": "nixpkgs",
-  "branch": "22.05",
-  "rev": "ce6aa13369b667ac2542593170993504932eb836",
-  "sha256": "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik"
+  "branch": "22.11",
+  "rev": "f413457e0dd7a42adefdbcea4391dd9751509025",
+  "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA="
 }
diff --git a/examples/toolchains/python/shell.nix b/examples/toolchains/python/shell.nix
index e84b5a81..a411bd03 100644
--- a/examples/toolchains/python/shell.nix
+++ b/examples/toolchains/python/shell.nix
@@ -1,3 +1,3 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 
-pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_5 ]; }
+pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }

From 7d887882e86ea268c1f8d8b55551edfec7ba0317 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann@tweag.io>
Date: Wed, 1 Feb 2023 16:41:15 +0100
Subject: [PATCH 08/11] Update Rust example to Bazel 6

---
 examples/toolchains/rust/shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/toolchains/rust/shell.nix b/examples/toolchains/rust/shell.nix
index c75e283d..3d802ae9 100644
--- a/examples/toolchains/rust/shell.nix
+++ b/examples/toolchains/rust/shell.nix
@@ -1,6 +1,6 @@
 { pkgs ? import ./nixpkgs.nix { } }:
 with pkgs;
 mkShell {
-  nativeBuildInputs = [ bazel_5 git nix zlib libiconv ]
+  nativeBuildInputs = [ bazel_6 git nix zlib libiconv ]
     ++ (lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]);
 }

From 6140739f2cd8922b67719e34c1df9c02918dd1cb Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann@tweag.io>
Date: Wed, 1 Feb 2023 16:45:28 +0100
Subject: [PATCH 09/11] Update Python container example to Bazel 6

---
 examples/python-container/nixpkgs.json | 6 +++---
 examples/python-container/shell.nix    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/python-container/nixpkgs.json b/examples/python-container/nixpkgs.json
index 52488744..2542221a 100644
--- a/examples/python-container/nixpkgs.json
+++ b/examples/python-container/nixpkgs.json
@@ -1,7 +1,7 @@
 {
   "owner": "NixOS",
   "repo": "nixpkgs",
-  "branch": "22.05",
-  "rev": "ce6aa13369b667ac2542593170993504932eb836",
-  "sha256": "0d643wp3l77hv2pmg2fi7vyxn4rwy0iyr8djcw1h5x72315ck9ik"
+  "branch": "22.11",
+  "rev": "f413457e0dd7a42adefdbcea4391dd9751509025",
+  "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA="
 }
diff --git a/examples/python-container/shell.nix b/examples/python-container/shell.nix
index 712218d6..c682f03a 100644
--- a/examples/python-container/shell.nix
+++ b/examples/python-container/shell.nix
@@ -2,7 +2,7 @@
 
 pkgs.mkShellNoCC {
     nativeBuildInputs = [
-       pkgs.bazel_5
+       pkgs.bazel_6
     ];
 }
 

From 2c471001e6156c3e418f84611a30d936764b93cf Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann@tweag.io>
Date: Wed, 1 Feb 2023 16:46:49 +0100
Subject: [PATCH 10/11] Remove remaining outdated nixpkgs version comments

These are unchecked by CI and too easy to forget to update.
---
 examples/toolchains/go/nixpkgs.nix     | 1 -
 examples/toolchains/nodejs/nixpkgs.nix | 1 -
 examples/toolchains/python/nixpkgs.nix | 1 -
 examples/toolchains/rust/nixpkgs.nix   | 1 -
 4 files changed, 4 deletions(-)

diff --git a/examples/toolchains/go/nixpkgs.nix b/examples/toolchains/go/nixpkgs.nix
index 120a30c3..6db312a3 100644
--- a/examples/toolchains/go/nixpkgs.nix
+++ b/examples/toolchains/go/nixpkgs.nix
@@ -1,5 +1,4 @@
 let
-  # nixpkgs 21.11
   spec = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
   nixpkgs = fetchTarball {
     url = "https://github.com/${spec.owner}/${spec.repo}/archive/${spec.rev}.tar.gz";
diff --git a/examples/toolchains/nodejs/nixpkgs.nix b/examples/toolchains/nodejs/nixpkgs.nix
index 120a30c3..6db312a3 100644
--- a/examples/toolchains/nodejs/nixpkgs.nix
+++ b/examples/toolchains/nodejs/nixpkgs.nix
@@ -1,5 +1,4 @@
 let
-  # nixpkgs 21.11
   spec = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
   nixpkgs = fetchTarball {
     url = "https://github.com/${spec.owner}/${spec.repo}/archive/${spec.rev}.tar.gz";
diff --git a/examples/toolchains/python/nixpkgs.nix b/examples/toolchains/python/nixpkgs.nix
index 120a30c3..6db312a3 100644
--- a/examples/toolchains/python/nixpkgs.nix
+++ b/examples/toolchains/python/nixpkgs.nix
@@ -1,5 +1,4 @@
 let
-  # nixpkgs 21.11
   spec = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
   nixpkgs = fetchTarball {
     url = "https://github.com/${spec.owner}/${spec.repo}/archive/${spec.rev}.tar.gz";
diff --git a/examples/toolchains/rust/nixpkgs.nix b/examples/toolchains/rust/nixpkgs.nix
index 120a30c3..6db312a3 100644
--- a/examples/toolchains/rust/nixpkgs.nix
+++ b/examples/toolchains/rust/nixpkgs.nix
@@ -1,5 +1,4 @@
 let
-  # nixpkgs 21.11
   spec = builtins.fromJSON (builtins.readFile ./nixpkgs.json);
   nixpkgs = fetchTarball {
     url = "https://github.com/${spec.owner}/${spec.repo}/archive/${spec.rev}.tar.gz";

From 790d9e6c96da49ec6711b3cd0f8a6df82d1578c3 Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann@tweag.io>
Date: Wed, 1 Feb 2023 16:50:51 +0100
Subject: [PATCH 11/11] set sha256 on rules_go in toolchain/go

---
 toolchains/go/WORKSPACE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchains/go/WORKSPACE b/toolchains/go/WORKSPACE
index 0dafaaac..94b2ccd9 100644
--- a/toolchains/go/WORKSPACE
+++ b/toolchains/go/WORKSPACE
@@ -31,7 +31,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "",
+    sha256 = "685052b498b6ddfe562ca7a97736741d87916fe536623afb7da2824c0211c369",
     urls = [
         "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip",
         "https://github.com/bazelbuild/rules_go/releases/download/v0.33.0/rules_go-v0.33.0.zip",