Skip to content

Commit ccc4fd3

Browse files
committed
use release 25.11
1 parent 01cafee commit ccc4fd3

File tree

7 files changed

+65
-34
lines changed

7 files changed

+65
-34
lines changed

default.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
lib,
33
stdenv,
44
buildGoApplication,
5+
go,
56
nix-gitignore,
67
coverage ? false, # https://tip.golang.org/doc/go1.20#cover
78
rocksdb,
@@ -39,6 +40,7 @@ buildGoApplication rec {
3940
tags
4041
ldflags
4142
;
43+
inherit go;
4244
src = (
4345
nix-gitignore.gitignoreSourcePure [
4446
"/*" # ignore all, then add whitelists
@@ -55,6 +57,7 @@ buildGoApplication rec {
5557
] ./.
5658
);
5759
modules = ./gomod2nix.toml;
60+
modRoot = ".";
5861
pwd = src; # needed to support replace
5962
subPackages = [ "cmd/cronosd" ];
6063
buildFlags = lib.optionalString coverage "-cover";

flake.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
inputs = {
3-
nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
3+
nixpkgs.url = "github:NixOS/nixpkgs/release-25.11";
44
flake-utils.url = "github:numtide/flake-utils";
55
nix-bundle-exe = {
66
url = "github:3noch/nix-bundle-exe";
@@ -29,6 +29,19 @@
2929
}:
3030
let
3131
rev = self.shortRev or "dirty";
32+
gomodOverlay =
33+
final: prev:
34+
let
35+
gomodSrc = gomod2nix.outPath;
36+
callPackage = final.callPackage;
37+
in
38+
{
39+
inherit (callPackage "${gomodSrc}/builder" { }) buildGoApplication mkGoEnv mkVendorEnv;
40+
gomod2nix =
41+
(callPackage "${gomodSrc}/default.nix" { }).overrideAttrs (_: {
42+
modRoot = ".";
43+
});
44+
};
3245
mkApp = drv: {
3346
type = "app";
3447
program = "${drv}/bin/${drv.meta.mainProgram}";
@@ -77,20 +90,21 @@
7790
}
7891
))
7992
// {
80-
overlays.default = [
81-
(import ./nix/build_overlay.nix)
82-
poetry2nix.overlays.default
83-
gomod2nix.overlays.default
84-
(import ./testground/benchmark/overlay.nix)
85-
(final: super: {
86-
go = super.go_1_23;
87-
test-env = final.callPackage ./nix/testenv.nix { };
88-
cronos-matrix = final.callPackage ./nix/cronos-matrix.nix {
89-
inherit rev;
90-
bundle-exe = final.pkgsBuildBuild.callPackage nix-bundle-exe { };
91-
};
92-
testground-image = final.callPackage ./nix/testground-image.nix { };
93-
})
94-
];
93+
overlays.default =
94+
[
95+
(import ./nix/build_overlay.nix)
96+
poetry2nix.overlays.default
97+
gomodOverlay
98+
(import ./testground/benchmark/overlay.nix)
99+
(final: super: {
100+
go = super.go_1_25;
101+
test-env = final.callPackage ./nix/testenv.nix { };
102+
cronos-matrix = final.callPackage ./nix/cronos-matrix.nix {
103+
inherit rev;
104+
bundle-exe = final.pkgsBuildBuild.callPackage nix-bundle-exe { };
105+
};
106+
testground-image = final.callPackage ./nix/testground-image.nix { };
107+
})
108+
];
95109
};
96110
}

nix/build_overlay.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ let
99
if len == 0 then [ ] else final.lib.lists.take (len - 1) l ++ [ newVal ];
1010
in
1111
{
12-
go_1_23 = super.go_1_23.overrideAttrs (old: rec {
13-
version = "1.23.12";
12+
go_1_25 = super.go_1_25.overrideAttrs (old: rec {
13+
version = "1.25.0";
1414
src = final.fetchurl {
1515
url = "https://go.dev/dl/go${version}.src.tar.gz";
16-
hash = "sha256-4czpN5ok6JVxSkEsfd0VfSYU2e2+g6hESbbhhAtPEiY=";
16+
hash = "sha256-S9AekSlyB7+kUOpA1NWpOxtTGl5DhHOyoG4Y4HciciU=";
1717
};
1818
});
1919
rocksdb = final.callPackage ./rocksdb.nix { };

nix/default.nix

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,30 @@ import sources.nixpkgs {
1111
dapptools-master = sources.dapptools-master;
1212
})
1313
(_: pkgs: {
14-
go = pkgs.go_1_23;
14+
go = pkgs.go_1_25;
1515
go-ethereum = pkgs.callPackage ./go-ethereum.nix {
1616
inherit (pkgs.darwin) libobjc;
1717
inherit (pkgs.darwin.apple_sdk.frameworks) IOKit;
18-
buildGoModule = pkgs.buildGo123Module;
18+
buildGoModule = pkgs.buildGoModule;
1919
};
2020
flake-compat = import sources.flake-compat;
2121
chain-maind = pkgs.callPackage sources.chain-main { rocksdb = null; };
2222
}) # update to a version that supports eip-1559
2323
(import "${sources.poetry2nix}/overlay.nix")
24-
(import "${sources.gomod2nix}/overlay.nix")
24+
(
25+
final: prev:
26+
let
27+
gomodSrc = sources.gomod2nix;
28+
callPackage = final.callPackage;
29+
in
30+
{
31+
inherit (callPackage "${gomodSrc}/builder" { }) buildGoApplication mkGoEnv mkVendorEnv;
32+
gomod2nix =
33+
(callPackage "${gomodSrc}/default.nix" { }).overrideAttrs (_: {
34+
modRoot = ".";
35+
});
36+
}
37+
)
2538
(
2639
pkgs: _:
2740
import ./scripts.nix {
@@ -65,7 +78,7 @@ import sources.nixpkgs {
6578
(_: pkgs: { test-env = pkgs.callPackage ./testenv.nix { }; })
6679
(_: pkgs: { cosmovisor = pkgs.callPackage ./cosmovisor.nix { }; })
6780
(_: pkgs: {
68-
rly = pkgs.buildGo123Module rec {
81+
rly = pkgs.buildGoModule rec {
6982
name = "rly";
7083
src = sources.relayer;
7184
subPackages = [ "." ];

nix/golangci-lint.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
2-
buildGo123Module,
2+
buildGoModule,
33
fetchFromGitHub,
44
lib,
55
installShellFiles,
6+
go_1_25,
67
}:
78

8-
buildGo123Module rec {
9+
(buildGoModule.override { go = go_1_25; }) rec {
910
pname = "golangci-lint";
1011
version = "2.1.6";
1112

nix/sources.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,15 +98,15 @@
9898
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
9999
},
100100
"nixpkgs": {
101-
"branch": "release-24.11",
101+
"branch": "release-25.11",
102102
"description": "Nix Packages collection",
103103
"homepage": "",
104104
"owner": "NixOS",
105105
"repo": "nixpkgs",
106-
"rev": "112c247873ba67732a9dd2563cb3d7b7749a82df",
107-
"sha256": "00ghsa6842lkd0c0k0ln6531inq03y4m0nphczwnhf5n9g72sddh",
106+
"rev": "f27d6578053dfba71ffe5156a8274a552340b730",
107+
"sha256": "1bbm0v081qih6ksqjdqisw452wky8jzx5yi961m0w2vfy3zaqmhb",
108108
"type": "tarball",
109-
"url": "https://github.com/NixOS/nixpkgs/archive/112c247873ba67732a9dd2563cb3d7b7749a82df.tar.gz",
109+
"url": "https://github.com/NixOS/nixpkgs/archive/f27d6578053dfba71ffe5156a8274a552340b730.tar.gz",
110110
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
111111
},
112112
"poetry2nix": {

0 commit comments

Comments
 (0)