From 9640b0f2546ea507cbd471c911dd931a5470a0f4 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Thu, 11 Mar 2021 16:48:12 +0100 Subject: [PATCH 1/3] Update bazel 3.7.2 --> 4.0.0 --- nixpkgs.json | 4 ++-- nixpkgs.nix | 2 +- shell.nix | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixpkgs.json b/nixpkgs.json index 5a844d9dc..4b6e9203f 100644 --- a/nixpkgs.json +++ b/nixpkgs.json @@ -2,6 +2,6 @@ "owner": "NixOS", "repo": "nixpkgs", "branch": "nixpkgs-unstable", - "rev": "24e5fe6075bc7a137bb701eb8a378f5a8689e10d", - "sha256": "1bkjh566r1bpbddz6fjhccn872p1dlvg5fwq9j2qdj4b5q2pmljc" + "rev": "ad4db3f4d8ae54482c63c31c14921cb73953548d", + "sha256": "1fwl898f6wznkjpwq11brgadz6iff5w5f4lwj2l7ax2rz7r03mnn" } diff --git a/nixpkgs.nix b/nixpkgs.nix index c786ea33b..b06b74462 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -1,5 +1,5 @@ let - # nixpkgs-unstable as of 2021-02-04 + # nixpkgs-unstable as of 2021-02-19 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/shell.nix b/shell.nix index f8ab58f43..e5c9f7280 100644 --- a/shell.nix +++ b/shell.nix @@ -4,7 +4,7 @@ with pkgs; mkShell { buildInputs = [ - bazel + bazel_4 cacert gcc nix From cc16de0b8f1c357e8bcd13c810aa6085f8ec1ea5 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Thu, 11 Mar 2021 18:05:11 +0100 Subject: [PATCH 2/3] Update platforms repository --- nixpkgs/repositories.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixpkgs/repositories.bzl b/nixpkgs/repositories.bzl index 61c236d3a..36583089e 100644 --- a/nixpkgs/repositories.bzl +++ b/nixpkgs/repositories.bzl @@ -7,10 +7,10 @@ def rules_nixpkgs_dependencies(): http_archive, "platforms", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.3/platforms-0.0.3.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.3/platforms-0.0.3.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.4/platforms-0.0.4.tar.gz", ], - sha256 = "460caee0fa583b908c622913334ec3c1b842572b9c23cf0d3da0c2543a1a157d", + sha256 = "079945598e4b6cc075846f7fd6a9d0857c33a7afc0de868c2ccb96405225135d", ) maybe( http_archive, From 1e1f0fa6e69e274377e6acc98e3162a47251bdb9 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Thu, 11 Mar 2021 18:06:37 +0100 Subject: [PATCH 3/3] Update rules_go --- WORKSPACE | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index ff6fc3cdf..7c0646f79 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -241,10 +241,10 @@ sh_posix_configure() http_archive( name = "io_bazel_rules_go", - sha256 = "7904dbecbaffd068651916dce77ff3437679f9d20e1a7956bff43826e7645fcc", + sha256 = "7c10271940c6bce577d51a075ae77728964db285dac0a46614a7934dc34303e6", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.25.1/rules_go-v0.25.1.tar.gz", - "https://github.com/bazelbuild/rules_go/releases/download/v0.25.1/rules_go-v0.25.1.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.26.0/rules_go-v0.26.0.tar.gz", + "https://github.com/bazelbuild/rules_go/releases/download/v0.26.0/rules_go-v0.26.0.tar.gz", ], )