Skip to content

[20.09] caddy1: fix build (#97988)#98020

Merged
jonringer merged 1 commit intoNixOS:release-20.09from
panchoh:backport-caddy1
Sep 15, 2020
Merged

[20.09] caddy1: fix build (#97988)#98020
jonringer merged 1 commit intoNixOS:release-20.09from
panchoh:backport-caddy1

Conversation

@panchoh
Copy link
Copy Markdown
Contributor

@panchoh panchoh commented Sep 15, 2020

Motivation for this change

Backport of #97988

(cherry picked from commit c814b0e)

ZHF: #97479

cc @NixOS/nixos-release-managers

caddy/main.go gets overwritten in order to build caddy with telemetry
disabled, but the global variable run got neglected, and this in turn
broke the test in caddy/main_test.go.

This commit fixes that, and build can now complete.

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.

@panchoh
caddy1: fix build (#97988)
09d8be0 
main.go gets overwritten in order to build caddy with telemetry
disabled, but the global variable `run` got neglected, and this in turn
broke the test in caddy/main_test.go.

This commit fixes that, and build can now complete.

(cherry picked from commit c814b0e)
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Sep 15, 2020
jonringer
jonringer approved these changes Sep 15, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 98020 1

1 package built:
  • caddy1

@panchoh panchoh deleted the backport-caddy1 branch September 15, 2020 07:48
@panchoh panchoh restored the backport-caddy1 branch April 28, 2021 10:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@fpletz fpletz Awaiting requested review from fpletz

@kalbasit kalbasit Awaiting requested review from kalbasit

@Br1ght0ne Br1ght0ne Awaiting requested review from Br1ght0ne

@rushmorem rushmorem Awaiting requested review from rushmorem

@zimbatm zimbatm Awaiting requested review from zimbatm

1 more reviewer

@jonringer jonringer jonringer approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@panchoh @jonringer