From a9803b2d10621c2a62afc3192d3828a7fd9e260f Mon Sep 17 00:00:00 2001 From: dudong2 Date: Wed, 29 Nov 2023 14:14:50 +0900 Subject: [PATCH] test: update nix go ver to 1.21 --- nix/default.nix | 4 ++-- nix/{go_1_18_overlay.nix => go_1_21_overlay.nix} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename nix/{go_1_18_overlay.nix => go_1_21_overlay.nix} (88%) diff --git a/nix/default.nix b/nix/default.nix index 56682938f0..378693d064 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -3,7 +3,7 @@ import sources.nixpkgs { overlays = [ (_: pkgs: { - go = pkgs.go_1_18; + go = pkgs.go_1_21; go-ethereum = pkgs.callPackage ./go-ethereum.nix { inherit (pkgs.darwin) libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; @@ -11,7 +11,7 @@ import sources.nixpkgs { }; }) # update to a version that supports eip-1559 # https://github.com/NixOS/nixpkgs/pull/179622 - (import ./go_1_18_overlay.nix) + (import ./go_1_21_overlay.nix) (final: prev: (import "${sources.gomod2nix}/overlay.nix") (final // { diff --git a/nix/go_1_18_overlay.nix b/nix/go_1_21_overlay.nix similarity index 88% rename from nix/go_1_18_overlay.nix rename to nix/go_1_21_overlay.nix index fdbe9c22d3..e37d4d2961 100644 --- a/nix/go_1_18_overlay.nix +++ b/nix/go_1_21_overlay.nix @@ -1,5 +1,5 @@ final: prev: { - go_1_18 = prev.go_1_18.override ({ + go_1_21 = prev.go_1_21.override ({ inherit (final.darwin.apple_sdk_11_0.frameworks) Security Foundation; xcbuild = prev.xcbuild.override { inherit (final.darwin.apple_sdk_11_0) stdenv;