Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Bazel version 6 and nixpkgs 22.11 #313

Merged
merged 12 commits into from
Feb 6, 2023
Merged

Update to Bazel version 6 and nixpkgs 22.11 #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7790cad
Update to Bazel version 6 in top-level
aherrmann Feb 1, 2023
3f2b10e
update cc example to Bazel 6
aherrmann Feb 1, 2023
5d42f74
Update cc_with_deps example to Bazel 6
aherrmann Feb 1, 2023
85ae521
Update go example to Bazel 6
aherrmann Feb 1, 2023
79589da
Update Java example to Bazel 6
aherrmann Feb 1, 2023
32ae6e4
Update NodeJS example to Bazel 6
aherrmann Feb 1, 2023
a1a8392
Update Python example to Bazel 6
aherrmann Feb 1, 2023
7d88788
Update Rust example to Bazel 6
aherrmann Feb 1, 2023
6140739
Update Python container example to Bazel 6
aherrmann Feb 1, 2023
2c47100
Remove remaining outdated nixpkgs version comments
aherrmann Feb 1, 2023
790d9e6
set sha256 on rules_go in toolchain/go
aherrmann Feb 1, 2023
41df71f
Merge branch 'master' into bazel-6
mergify[bot] Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/python-container/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="
}
2 changes: 1 addition & 1 deletion examples/python-container/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pkgs.mkShellNoCC {
nativeBuildInputs = [
pkgs.bazel_5
pkgs.bazel_6
];
}

6 changes: 3 additions & 3 deletions examples/toolchains/cc/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="
}
1 change: 0 additions & 1 deletion examples/toolchains/cc/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion examples/toolchains/cc/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{ pkgs ? import ./nixpkgs.nix { } }:

pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_5 ]; }
pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }
6 changes: 3 additions & 3 deletions examples/toolchains/cc_with_deps/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="
}
1 change: 0 additions & 1 deletion examples/toolchains/cc_with_deps/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion examples/toolchains/cc_with_deps/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{ pkgs ? import ./nixpkgs.nix { } }:

pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_5 ]; }
pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }
6 changes: 3 additions & 3 deletions examples/toolchains/go/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="
}
1 change: 0 additions & 1 deletion examples/toolchains/go/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion examples/toolchains/go/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{ pkgs ? import ./nixpkgs.nix { } }:

pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_5 ]; }
pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }
6 changes: 3 additions & 3 deletions examples/toolchains/java/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="
}

2 changes: 1 addition & 1 deletion examples/toolchains/java/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{ pkgs ? import ./nixpkgs.nix { } }:

pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_5 ]; }
pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }
6 changes: 3 additions & 3 deletions examples/toolchains/nodejs/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="
}
1 change: 0 additions & 1 deletion examples/toolchains/nodejs/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion examples/toolchains/nodejs/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{ pkgs ? import ./nixpkgs.nix { } }:

pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_5 ]; }
pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }
6 changes: 3 additions & 3 deletions examples/toolchains/python/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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="
}
1 change: 0 additions & 1 deletion examples/toolchains/python/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion examples/toolchains/python/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{ pkgs ? import ./nixpkgs.nix { } }:

pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_5 ]; }
pkgs.mkShellNoCC { nativeBuildInputs = [ pkgs.bazel_6 ]; }
1 change: 0 additions & 1 deletion examples/toolchains/rust/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
2 changes: 1 addition & 1 deletion examples/toolchains/rust/shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ]);
}
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ];
};
});
}
2 changes: 1 addition & 1 deletion toolchains/go/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down