File tree Expand file tree Collapse file tree 3 files changed +15
-12
lines changed
Expand file tree Collapse file tree 3 files changed +15
-12
lines changed Original file line number Diff line number Diff line change 9595 gomodOverlay
9696 ( import ./testground/benchmark/overlay.nix )
9797 ( final : super : {
98- go = super . go_1_25 ;
98+ go = final . go_1_25 ;
9999 test-env = final . callPackage ./nix/testenv.nix { pkgs = final ; } ;
100100 cronos-matrix = final . callPackage ./nix/cronos-matrix.nix {
101101 inherit rev ;
Original file line number Diff line number Diff line change 2020 hash = "sha256-S9AekSlyB7+kUOpA1NWpOxtTGl5DhHOyoG4Y4HciciU=" ;
2121 } ;
2222 # Filter out patches that don't apply to Go 1.25
23- patches = builtins . filter (
24- patch :
25- let
26- patchName = builtins . baseNameOf ( builtins . toString patch ) ;
27- in
28- ! final . lib . hasSuffix "-iana-etc-1.17.patch" patchName
29- ) ( old . patches or [ ] ) ;
23+ patches =
24+ builtins . filter (
25+ patch :
26+ let
27+ name = builtins . baseNameOf ( builtins . toString patch ) ;
28+ in
29+ ! ( final . lib . hasSuffix "iana-etc-1.17.patch" name )
30+ ) ( old . patches or [ ] ) ;
3031 # Apply the iana-etc substitutions manually for Go 1.25
3132 postPatch = ( old . postPatch or "" ) + ''
3233 substituteInPlace src/net/lookup_unix.go \
Original file line number Diff line number Diff line change @@ -10,8 +10,9 @@ import sources.nixpkgs {
1010 dapptools-release = sources . dapptools ;
1111 dapptools-master = sources . dapptools-master ;
1212 } )
13- ( _ : pkgs : {
14- go = pkgs . go_1_25 ;
13+ (
14+ final : pkgs : {
15+ go = final . go_1_25 ;
1516 go-ethereum = pkgs . callPackage ./go-ethereum.nix {
1617 buildGoModule = pkgs . buildGoModule ;
1718 } ;
@@ -20,15 +21,16 @@ import sources.nixpkgs {
2021 ( pkgs . callPackage sources . chain-main {
2122 rocksdb = null ;
2223 buildPackages = pkgs . buildPackages // {
23- go_1_23 = pkgs . buildPackages . go_1_25 ;
24+ go_1_23 = final . buildPackages . go_1_25 ;
2425 } ;
2526 } ) . overrideAttrs
2627 ( old : {
2728 # Fix modRoot issue - gomod2nix builder needs modRoot set to non-null
2829 # See: https://github.com/crypto-org-chain/chain-main/pull/1220
2930 modRoot = "." ;
3031 } ) ;
31- } )
32+ }
33+ )
3234 ( import "${ sources . poetry2nix } /overlay.nix" )
3335 (
3436 final : prev :
You can’t perform that action at this time.
0 commit comments