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.

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

varnish5: fix build #66564

Merged
merged 2 commits into from Aug 17, 2019
Merged

varnish5: fix build #66564

merged 2 commits into from Aug 17, 2019

Conversation

jonringer
Copy link
Contributor

@jonringer jonringer commented Aug 13, 2019 •
edited

Motivation for this change

fixing some regression from #66559

varnish5 isn't ready for the upgrade to python3, but varnish 6 requires it, so i parameterized it in the generic builder.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @fpletz @mmahut

before:

[1 built (1 failed), 21 copied (28.5 MiB), 19.5 MiB DL]
error: build of '/nix/store/zjv7yyzyjbj4f0zf9kzwc9ifj9m42mc0-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/66559
4 package failed to build:
collectd collectd-data prometheus-varnish-exporter varnish

after:

[1 built, 6 copied (15.8 MiB), 4.0 MiB DL]
5 package were build:
collectd collectd-data prometheus-varnish-exporter varnish varnish4

@jonringer
Copy link
Contributor Author

@GrahamcOfBorg build varnish4 varnish5 varnish6

@ofborg ofborg bot requested a review from fpletz August 13, 2019 13:12
@mmahut
Copy link
Member

mmahut commented Aug 13, 2019

@GrahamcOfBorg build varnish4 varnish5 varnish6

@jonringer
Copy link
Contributor Author

passed the python version used by varnish to the plugins, should work now

@jonringer
Copy link
Contributor Author

@GrahamcOfBorg build varnish5Packages varnish4Packages

@jonringer
Copy link
Contributor Author

it was for some of the packages, I didn't test moving python back to native after I pinned the package

@jonringer
Copy link
Contributor Author

@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.varnish4
@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.varnish5
@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.varnish6
@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.varnish4Packages
@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.varnish5Packages
@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.varnish6Packages

I applied your suggestions

@Mic92
Copy link
Member

Mic92 commented Aug 15, 2019

@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.varnish4
@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.varnish5
@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.varnish6
@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.varnish4Packages
@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.varnish5Packages
@GrahamcOfBorg build pkgsCross.armv7l-hf-multiplatform.varnish6Packages

@risicle
Copy link
Contributor

risicle commented Aug 16, 2019

nix-review is happy on macos 10.13

@Mic92 Mic92 merged commit 2baf41b into NixOS:master Aug 17, 2019
@jonringer jonringer deleted the fix-varnish branch August 17, 2019 16:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmahut mmahut mmahut left review comments

@fpletz fpletz Awaiting requested review from fpletz

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@jonringer @mmahut @Mic92 @risicle