Skip to content

Commit 9271a38

Browse files
committed
go 1.25
1 parent 8a9cb89 commit 9271a38

File tree

4 files changed

+34
-11
lines changed

4 files changed

+34
-11
lines changed

tests/nix/default.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ import sources.nixpkgs {
1111
(import "${sources.poetry2nix}/overlay.nix")
1212
(_: pkgs: { test-env = pkgs.callPackage ./testenv.nix { }; })
1313
(_: pkgs: { evmd = pkgs.callPackage ./evm/default.nix { }; })
14+
(_: pkgs: {
15+
go_1_25 = pkgs.callPackage ./go_1_25.nix { };
16+
evmd = pkgs.callPackage ./evm/default.nix { };
17+
})
1418
];
1519
config = { };
1620
inherit system;

tests/nix/evm/default.nix

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
lib,
33
stdenv,
4-
buildGo123Module,
4+
buildGoModule,
5+
go_1_25,
56
fetchFromGitHub,
67
rev ? "dirty",
78
nativeByteOrder ? true, # nativeByteOrder mode will panic on big endian machines
@@ -13,9 +14,11 @@ let
1314
pname = "evmd";
1415

1516
# Use static packages for Linux to ensure musl compatibility
16-
buildPackages = if stdenv.isLinux then pkgsStatic else { inherit stdenv buildGo123Module; };
17+
buildPackages = if stdenv.isLinux then pkgsStatic else { inherit stdenv; buildGoModule = buildGoModule.override { go = go_1_25; }; };
1718
buildStdenv = buildPackages.stdenv;
18-
buildGo123Module' = if stdenv.isLinux then buildPackages.buildGo123Module else buildGo123Module;
19+
buildGoModule' = if stdenv.isLinux
20+
then (buildPackages.buildGoModule.override { go = go_1_25; })
21+
else (buildGoModule.override { go = go_1_25; });
1922

2023
tags =
2124
[
@@ -25,6 +28,7 @@ let
2528
"pebbledb"
2629
]
2730
++ lib.optionals nativeByteOrder [ "nativebyteorder" ]
31+
++ lib.optionals buildStdenv.isDarwin [ "static_wasm" ]
2832
++ lib.optionals buildStdenv.isLinux [ "muslc" ];
2933

3034
ldflags =
@@ -45,7 +49,7 @@ let
4549
];
4650

4751
in
48-
buildGo123Module' rec {
52+
buildGoModule' rec {
4953
inherit
5054
pname
5155
version
@@ -56,19 +60,20 @@ buildGo123Module' rec {
5660
src = fetchFromGitHub {
5761
owner = "cosmos";
5862
repo = "evm";
59-
rev = "733ea6190eb1be15ed1276ab54f4a8b511ff1c66";
60-
hash = "sha256-mZQhW6CpIUGPj3WWw5v2Zeov1mMnKx+ZqNX3YcFOcVE=";
63+
rev = "79bcc14fefa4b5c82386a3fb0724c3f9a7688ba5";
64+
hash = "sha256-QoQR7VBkAUMTj9M4qbAK76avjgiyH8htUeFFggVDExA=";
6165
};
6266

63-
vendorHash = "sha256-IDJHj2e2LBMe0BtwduG7/wLM/C2rRQyIUpbMawJAilk=";
67+
vendorHash = "sha256-DO9SS1c5p9hSMR2M+bCxci/kdjpN7a9TZhMZhq2Efag=";
6468
proxyVendor = true;
6569
sourceRoot = "source/evmd";
6670
subPackages = [ "cmd/evmd" ];
67-
CGO_ENABLED = "1";
6871

6972
preBuild = ''
7073
mkdir -p $TMPDIR/lib
74+
export CGO_ENABLED=1
7175
export CGO_LDFLAGS="-L$TMPDIR/lib $CGO_LDFLAGS"
76+
export GOTOOLCHAIN=local
7277
'';
7378

7479
doCheck = false;

tests/nix/go_1_25.nix

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{ pkgs }:
2+
3+
let
4+
nixpkgs-unstable = builtins.fetchTarball {
5+
url = "https://github.com/NixOS/nixpkgs/archive/7241bcbb4f099a66aafca120d37c65e8dda32717.tar.gz";
6+
sha256 = "1awaf4s01snazyvy7s788m47dzc7k4vd8hj1ikxfvrrgpa1w03k2";
7+
};
8+
9+
unstable = import nixpkgs-unstable {
10+
system = pkgs.system;
11+
config = {};
12+
};
13+
in
14+
unstable.go_1_25 or pkgs.go_1_23

tests/nix/sources.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929
"homepage": "",
3030
"owner": "NixOS",
3131
"repo": "nixpkgs",
32-
"rev": "daa477e013dd736c939fcc111dc4dd889bc17c94",
33-
"sha256": "1vbbl1iy5wxmwww8hi1ngcby6mnyzn7l5x9yxf58yd9z0nmx6p74",
32+
"rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
33+
"sha256": "1s2gr5rcyqvpr58vxdcb095mdhblij9bfzaximrva2243aal3dgx",
3434
"type": "tarball",
35-
"url": "https://github.com/NixOS/nixpkgs/archive/daa477e013dd736c939fcc111dc4dd889bc17c94.tar.gz",
35+
"url": "https://github.com/NixOS/nixpkgs/archive/50ab793786d9de88ee30ec4e4c24fb4236fc2674.tar.gz",
3636
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
3737
},
3838
"poetry2nix": {

0 commit comments

Comments
 (0)