From a5aa47d8a2f3f5be302dc5ddb1989bf1073ccfa2 Mon Sep 17 00:00:00 2001 From: Chris Doherty Date: Tue, 11 Apr 2023 09:15:47 -0500 Subject: [PATCH] Update Go to v1.20 Signed-off-by: Chris Doherty --- .github/workflows/ci.yaml | 4 ++-- shell.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 83583538e..d0dfa387f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,8 +7,8 @@ on: - "v*" pull_request: env: - CGO_ENABLED: 0 - GO_VERSION: 1.18 + CGO_ENABLED: "0" + GO_VERSION: "1.20" jobs: verify: name: Verify diff --git a/shell.nix b/shell.nix index bf97972fa..ae2757b96 100644 --- a/shell.nix +++ b/shell.nix @@ -14,12 +14,12 @@ let # go 1.18.5 owner = "NixOS"; repo = "nixpkgs"; - #branch@date: nixpkgs-unstable@2022-09-02 - rev = "ee01de29d2f58d56b1be4ae24c24bd91c5380cea"; - sha256 = "0829fqp43cp2ck56jympn5kk8ssjsyy993nsp0fjrnhi265hqps7"; + # branch@date: nixpkgs-unstable@2023-03-30 + rev = "8b3bc690e201c8d3cbd14633dbf3462a820e73f2"; + sha256 = "sha256-+ckiCxbGFSs1/wHKCXAZnvb37Htf6k5nmQE3T0Y7hK8="; }) { }; - go_1_18_5 = pkgs.go; + go_1_20_3 = pkgs.go; in mkShell { buildInputs = [ @@ -27,7 +27,7 @@ in mkShell { git gnumake gnused - go_1_18_5 + go_1_20_3 jq nixfmt nodePackages.prettier