Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

telegraf: patch go.mod, remove runVend #95485

Merged
merged 1 commit into from Aug 15, 2020
Merged

telegraf: patch go.mod, remove runVend #95485

merged 1 commit into from Aug 15, 2020

Conversation

zowoq
Copy link
Contributor

@zowoq zowoq commented Aug 15, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested review from Mic92, foxit64 and kalbasit August 15, 2020 05:57
@zowoq zowoq mentioned this pull request Aug 15, 2020
Closed
10 tasks
Mic92
Mic92 reviewed Aug 15, 2020
View reviewed changes
pkgs/servers/monitoring/telegraf/default.nix Outdated
runVend = true;
vendorSha256 = "0c2sayg49b2rq3fnrbf741b6zy8byhwxlnxkhf5160gzqn6jy2rw";
patches = [
./gomod.patch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you use fetchpatch here?

https://github.com/influxdata/telegraf/commit/a0d0c80c373dd1896d449e9f3534a157d78fc866.patch

This is the PR:

influxdata/telegraf#7988

Copy link
Contributor Author

@zowoq zowoq Aug 15, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

vendor/github.com/shirou/gopsutil/host/host_bsd.go:25:13: undefined: unix.SysctlTimeval

Looks like it works with 2.20.6 and breaks with a different issue on 2.20.7.

Copy link
Member

@Mic92 Mic92 Aug 15, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. I will have a look.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bumped to 2.20.6: Let's see if that makes CI happy: https://github.com/influxdata/telegraf/commit/63e1f41d8ff246d191d008ff7f69d69cc34b4fae.patch

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Builds with patch, generates the same vendorSha256.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks this patch breaks FreeBSD now.... https://app.circleci.com/pipelines/github/influxdata/telegraf/1327/workflows/6b7efed4-74fb-45bf-a3c7-2978f9bdf5bb/jobs/62496

However I think this should be good enough for nixpkgs.

@Mic92 Mic92 merged commit edb8db8 into NixOS:master Aug 15, 2020
@zowoq zowoq deleted the telegraf branch August 15, 2020 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@foxit64 foxit64 Awaiting requested review from foxit64

@kalbasit kalbasit Awaiting requested review from kalbasit

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@zowoq @Mic92