-
-
Notifications
You must be signed in to change notification settings - Fork 161
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
influxdb: update flux to build 2.7.11 rel against rust 1.83
Signed-off-by: Rui Chen <[email protected]>
- Loading branch information
1 parent
a2f5c7e
commit a188def
Showing
1 changed file
with
67 additions
and
0 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| From c4e293432187f0fd47ba2a6afc5ed1b46f67ae68 Mon Sep 17 00:00:00 2001 | ||
| From: Rui Chen <[email protected]> | ||
| Date: Tue, 31 Dec 2024 17:23:10 -0500 | ||
| Subject: [PATCH] fix: update flux dep to fix rust 1.83 build issue | ||
|
|
||
| Signed-off-by: Rui Chen <[email protected]> | ||
| --- | ||
| go.mod | 5 ++++- | ||
| go.sum | 8 ++++---- | ||
| 2 files changed, 8 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/go.mod b/go.mod | ||
| index c8857963cf..2cb3bc27ce 100644 | ||
| --- a/go.mod | ||
| +++ b/go.mod | ||
| @@ -37,7 +37,7 @@ require ( | ||
| github.com/influxdata/influx-cli/v2 v2.2.1-0.20221028161653-3285a03e9e28 | ||
| github.com/influxdata/influxql v1.1.1-0.20211004132434-7e7d61973256 | ||
| github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 | ||
| - github.com/influxdata/pkg-config v0.2.11 | ||
| + github.com/influxdata/pkg-config v0.2.14 | ||
| github.com/jmoiron/sqlx v1.3.4 | ||
| github.com/jsternberg/zap-logfmt v1.2.0 | ||
| github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef | ||
| @@ -253,3 +253,6 @@ require ( | ||
| ) | ||
|
|
||
| replace github.com/nats-io/nats-streaming-server v0.11.2 => github.com/influxdata/nats-streaming-server v0.11.3-0.20201112040610-c277f7560803 | ||
| + | ||
| +// rust 1.83 build patch, upstream pr ref, https://github.com/influxdata/flux/pull/5516 | ||
| +replace github.com/influxdata/flux => github.com/chenrui333/flux v0.195.3-0.20241130224633-08b6cb784759 | ||
| diff --git a/go.sum b/go.sum | ||
| index 0a3641d9ba..96a5d0ab37 100644 | ||
| --- a/go.sum | ||
| +++ b/go.sum | ||
| @@ -231,6 +231,8 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL | ||
| github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= | ||
| github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= | ||
| github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= | ||
| +github.com/chenrui333/flux v0.195.3-0.20241130224633-08b6cb784759 h1:YAvnd1oZRFTl5Vsg8upbcSCuaui2xO8UPl0Bcr84AxQ= | ||
| +github.com/chenrui333/flux v0.195.3-0.20241130224633-08b6cb784759/go.mod h1:aQCVNcndUB2vbqkWHEwzHc0P3Xv8bJweVPY2TKkaP2E= | ||
| github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= | ||
| github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= | ||
| github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= | ||
| @@ -585,8 +587,6 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH | ||
| github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= | ||
| github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe h1:7j4SdN/BvQwN6WoUq7mv0kg5U9NhnFBxPGMafYRKym0= | ||
| github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe/go.mod h1:XabtPPW2qsCg0tl+kjaPU+cFS+CjQXEXbT1VJvHT4og= | ||
| -github.com/influxdata/flux v0.195.2 h1:1PaOlgokvrzKDEPupZe0EvOnnC58MYgmX3LACOiZ1zk= | ||
| -github.com/influxdata/flux v0.195.2/go.mod h1:4m3cIbYtsHcduTpd4/4+GwFOFO1uiBTibfz1T7Wlk8M= | ||
| github.com/influxdata/gosnowflake v1.9.0 h1:fw6peFfTfJK+jbI98RzEEbte8F1SNBX8a91cqzGFcaE= | ||
| github.com/influxdata/gosnowflake v1.9.0/go.mod h1:VYPoQhZtz3I1zh+YIMG4axm/iUxoKCTbTEQl/SYvUNM= | ||
| github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69 h1:WQsmW0fXO4ZE/lFGIE84G6rIV5SJN3P3sjIXAP1a8eU= | ||
| @@ -609,8 +609,8 @@ github.com/influxdata/line-protocol/v2 v2.0.0-20210312151457-c52fdecb625a/go.mod | ||
| github.com/influxdata/line-protocol/v2 v2.1.0/go.mod h1:QKw43hdUBg3GTk2iC3iyCxksNj7PX9aUSeYOYE/ceHY= | ||
| github.com/influxdata/line-protocol/v2 v2.2.1 h1:EAPkqJ9Km4uAxtMRgUubJyqAr6zgWM0dznKMLRauQRE= | ||
| github.com/influxdata/line-protocol/v2 v2.2.1/go.mod h1:DmB3Cnh+3oxmG6LOBIxce4oaL4CPj3OmMPgvauXh+tM= | ||
| -github.com/influxdata/pkg-config v0.2.11 h1:RDlWAvkTARzPRGChq34x179TYlRndq8OU5Ro80E9g3Q= | ||
| -github.com/influxdata/pkg-config v0.2.11/go.mod h1:EMS7Ll0S4qkzDk53XS3Z72/egBsPInt+BeRxb0WeSwk= | ||
| +github.com/influxdata/pkg-config v0.2.14 h1:XLn40pDrzAj2q+WYfnczwcZy0xVXHHP+XuL/Mi54S2I= | ||
| +github.com/influxdata/pkg-config v0.2.14/go.mod h1:EMS7Ll0S4qkzDk53XS3Z72/egBsPInt+BeRxb0WeSwk= | ||
| github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b h1:i44CesU68ZBRvtCjBi3QSosCIKrjmMbYlQMFAwVLds4= | ||
| github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b/go.mod h1:Z0kXnxzbTC2qrx4NaIzYkE1k66+6oEDQTvL95hQFh5Y= | ||
| github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= | ||
| -- | ||
| 2.47.1 | ||
|
|