Date: Monday, April 4, 2022 @ 09:08:04 Author: jelle Revision: 1181216
upgpkg: grafana 8.4.5-2 Added: grafana/trunk/update-gonum-for-golang-1.18.patch Modified: grafana/trunk/PKGBUILD ------------------------------------+ PKGBUILD | 6 ++-- update-gonum-for-golang-1.18.patch | 51 +++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-04 09:00:33 UTC (rev 1181215) +++ PKGBUILD 2022-04-04 09:08:04 UTC (rev 1181216) @@ -4,7 +4,7 @@ pkgname=grafana pkgver=8.4.5 -pkgrel=1 +pkgrel=2 pkgdesc='Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB' url='https://grafana.com/' arch=('x86_64') @@ -16,12 +16,14 @@ 'grafana.service' 'grafana.sysusers' 'grafana.tmpfiles' + 'update-gonum-for-golang-1.18.patch' ) install=$pkgname.install sha512sums=('SKIP' '02a597225ee6ba8da9491a94daa33fe681846e2140e02fbb461ff7d39acd4cf99694dc03fb5f2c5ecfd180b09c44a41fe639b121499b4222b67ada57dc60d850' '38b46d953837a7afa5a654dfeef163b210d56cad57d937018531d00cd63b5341d6f9cd777299bdc7a994d0cb7df09b8157aad0f166e76ad47564e1ad6d5441d4' - 'c1724bfc7cbd6a406f17acb661efca0f1e57e2c30cc1841f4cb7ccfc420adc40cc61cb1c023d00444827b2c40e9caa4c2fefbfd503419848c74a0b455b2375ab') + 'c1724bfc7cbd6a406f17acb661efca0f1e57e2c30cc1841f4cb7ccfc420adc40cc61cb1c023d00444827b2c40e9caa4c2fefbfd503419848c74a0b455b2375ab' + '0e5c11af60fac0cba008df2ceb712a0fa3437089270c2586d95689dcf477ba86086a10a60174d878c05dbded00b99d8bb7caac1a9303af2dd2842269029b85e1') validpgpkeys=("D45B6DC53E9057C46487E25CE17E9ABACEFA59EB" "43511C6A68C9A1DE451EF51890AA4FDC4D63CBEA" "AA70DF6234FBF96AB9101D09E6D5D452E87026E9" # https://github.com/aknuds1.gpg Added: update-gonum-for-golang-1.18.patch =================================================================== --- update-gonum-for-golang-1.18.patch (rev 0) +++ update-gonum-for-golang-1.18.patch 2022-04-04 09:08:04 UTC (rev 1181216) @@ -0,0 +1,51 @@ +diff --git a/go.mod b/go.mod +index 47025e4f09e..226a2d2d3a3 100644 +--- a/go.mod ++++ b/go.mod +@@ -105,12 +105,12 @@ require ( + go.opentelemetry.io/otel/trace v1.2.0 + golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e + golang.org/x/exp v0.0.0-20210220032938-85be41e4509f // indirect +- golang.org/x/net v0.0.0-20211013171255-e13a2654a71e ++ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f + golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac +- golang.org/x/tools v0.1.5 +- gonum.org/v1/gonum v0.9.3 ++ golang.org/x/tools v0.1.9 ++ gonum.org/v1/gonum v0.11.0 + google.golang.org/api v0.58.0 + google.golang.org/grpc v1.41.0 + google.golang.org/protobuf v1.27.1 +diff --git a/go.sum b/go.sum +index d61f62786e5..b36d5b0b07b 100644 +--- a/go.sum ++++ b/go.sum +@@ -2738,6 +2738,8 @@ golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qx + golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= + golang.org/x/net v0.0.0-20211013171255-e13a2654a71e h1:Xj+JO91noE97IN6F/7WZxzC5QE6yENAQPrwIYhW3bsA= + golang.org/x/net v0.0.0-20211013171255-e13a2654a71e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= ++golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY= ++golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= + golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= + golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= + golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +@@ -3068,6 +3070,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= + golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= + golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= + golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= ++golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8= ++golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= + golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= + golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +@@ -3082,6 +3086,8 @@ gonum.org/v1/gonum v0.6.2/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= + gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0= + gonum.org/v1/gonum v0.9.3 h1:DnoIG+QAMaF5NvxnGe/oKsgKcAc6PcUyl8q0VetfQ8s= + gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0= ++gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E= ++gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA= + gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= + gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0 h1:OE9mWmgKkjJyEmDAAtGMPjXu+YNeGvK9VTSHY6+Qihc= + gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
