Skip to content

Commit

Permalink
test: update nix go ver to 1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
dudong2 committed Nov 29, 2023
1 parent 71c8a78 commit a9803b2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
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;
buildGoModule = pkgs.buildGo118Module;
};
}) # 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 // {
Expand Down
2 changes: 1 addition & 1 deletion nix/go_1_18_overlay.nix → nix/go_1_21_overlay.nix
Original file line number Diff line number Diff line change
@@ -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;
Expand Down

0 comments on commit a9803b2

Please sign in to comment.