aland/nixpkgs-odroid-hc4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead

Browse source 
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948
this can do it nicely.

Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov 2021-04-03 12:58:10 +02:00 • committed by Alan Daniels
commit 56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
pkgs/servers/monitoring/prometheus/promscale/0001-remove-jaeger-test-dep.patch Normal file
View file

@ -0,0 +1,17 @@
A Promscale test has a dependency on a package which was not intended to be
vendored, so `go mod vendor` breaks. The dependency is not required to build
Promscale, so it can be removed.
diff --git a/pkg/tests/end_to_end_tests/trace_query_integration_test.go b/pkg/tests/end_to_end_tests/trace_query_integration_test.go
index 84a0d08..efbe5e1 100644
--- a/pkg/tests/end_to_end_tests/trace_query_integration_test.go
+++ b/pkg/tests/end_to_end_tests/trace_query_integration_test.go
@@ -24,7 +24,6 @@ import (
ingstr "github.com/timescale/promscale/pkg/pgmodel/ingestor"
"github.com/timescale/promscale/pkg/pgxconn"
- jaegerQueryApp "github.com/jaegertracing/jaeger/cmd/query/app"
jaegerQueryService "github.com/jaegertracing/jaeger/cmd/query/app/querysvc"
jaegerJSONModel "github.com/jaegertracing/jaeger/model/json"
)