forked from evmos/ethermint
-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Problem: CacheWrapWithTrace is not supported (#565)
* Problem: CacheWrapWithTrace is not supported * align nixpkgs * deps * fix build
- Loading branch information
Showing
10 changed files
with
91 additions
and
48 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,21 @@ | ||
| # some basic overlays necessary for the build | ||
| final: super: { | ||
| final: super: | ||
| let | ||
| replaceLast = | ||
| newVal: l: | ||
| let | ||
| len = builtins.length l; | ||
| in | ||
| if len == 0 then [ ] else final.lib.lists.take (len - 1) l ++ [ newVal ]; | ||
| in | ||
| { | ||
| go_1_23 = super.go_1_23.overrideAttrs (old: rec { | ||
| version = "1.23.4"; | ||
| src = final.fetchurl { | ||
| url = "https://go.dev/dl/go${version}.src.tar.gz"; | ||
| hash = "sha256-rTRaxCHpCBQpOpaZzKGd1SOCUcP2h5gLvK4oSVsmNTE="; | ||
| }; | ||
| # https://github.com/NixOS/nixpkgs/pull/372367 | ||
| patches = replaceLast ./go_no_vendor_checks-1.23.patch old.patches; | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| diff --git a/src/cmd/go/internal/modload/import.go b/src/cmd/go/internal/modload/import.go | ||
| index a3105b6b6d..0e10154a70 100644 | ||
| --- a/src/cmd/go/internal/modload/import.go | ||
| +++ b/src/cmd/go/internal/modload/import.go | ||
| @@ -345,7 +345,7 @@ func importFromModules(ctx context.Context, path string, rs *Requirements, mg *M | ||
| // vendor/modules.txt does not exist or the user manually added directories to the vendor directory. | ||
| // Go 1.23 and later require vendored packages to be present in modules.txt to be imported. | ||
| _, ok := vendorPkgModule[path] | ||
| - if ok || (gover.Compare(MainModules.GoVersion(), gover.ExplicitModulesTxtImportVersion) < 0) { | ||
| + if ok || (gover.Compare(MainModules.GoVersion(), gover.ExplicitModulesTxtImportVersion) < 0) || os.Getenv("GO_NO_VENDOR_CHECKS") == "1" { | ||
| mods = append(mods, vendorPkgModule[path]) | ||
| dirs = append(dirs, dir) | ||
| roots = append(roots, vendorDir) | ||
| diff --git a/src/cmd/go/internal/modload/vendor.go b/src/cmd/go/internal/modload/vendor.go | ||
| index b2cb44100e..05bf3829d5 100644 | ||
| --- a/src/cmd/go/internal/modload/vendor.go | ||
| +++ b/src/cmd/go/internal/modload/vendor.go | ||
| @@ -159,7 +159,7 @@ func checkVendorConsistency(indexes []*modFileIndex, modFiles []*modfile.File, m | ||
| panic(fmt.Errorf("not in workspace mode but number of indexes is %v, not 1", len(indexes))) | ||
| } | ||
| index := indexes[0] | ||
| - if gover.Compare(index.goVersion, "1.14") < 0 { | ||
| + if gover.Compare(index.goVersion, "1.14") < 0 || (os.Getenv("GO_NO_VENDOR_CHECKS") == "1" && len(vendorMeta) == 0) { | ||
| // Go versions before 1.14 did not include enough information in | ||
| // vendor/modules.txt to check for consistency. | ||
| // If we know that we're on an earlier version, relax the consistency check. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters