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

haproxy: PCRE and LUA support via configurable options #24380

Merged
merged 3 commits into from Mar 31, 2017

Conversation

fuzzy-id
Copy link
Contributor

Motivation for this change

This solves #23806 and is a follow up to #23901 and #24248. PCRE and LUA support are added via configurable options. Both are enabled by default, apart from LUA on Darwin where compilation breaks.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

`preConfigure` line became too long to edit comfortably. Split up
flags into ones necessary during both build and install phase and
install phase only. Makefile defines a target for OS X/Darwin which
automatically sets the `KQUEUE` flag.
@mention-bot
Copy link

@fuzzy-id, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rbvermaa, @pmahoney and @garbas to be potential reviewers.

@garbas
Copy link
Member

garbas commented Mar 27, 2017

@fuzzy-id would you be willing to take over the maintenance of this package? In the past I used haproxy a lot, now I'm doing different work.

@fuzzy-id
Copy link
Contributor Author

Could you elaborate on what it means to take over maintenance?

@LnL7
Copy link
Member

LnL7 commented Mar 27, 2017

The meta.maintainers is used by hydra to email people when a build breaks and serves reference to notify the relevant people when there are questions, issues, updates, etc. for a package.

@fuzzy-id
Copy link
Contributor Author

I would like to post-pone this step a bit as I will be afk for quite some time this summer. But I would be very glad to take over maintenance in autumn.

@fuzzy-id
Copy link
Contributor Author

On the other hand, I will be around until end of may. Is it possible to add me to the list of maintainers and then drop @garbas entirely when I'm back. Would this be an option?

@garbas
Copy link
Member

garbas commented Mar 28, 2017

@fuzzy-id 👍 sounds great! You can add yourself to the list in this PR.

(1) edit this line
(2) add yourself to the maintainers list (make sure you do it in alphabetic order since you never know when a person with severe OCD will look at it 😄)
(3) celebrate 🎉 🎉 🎉 🎉 🎉 🎉 🎉

Thomas Bach added 2 commits March 29, 2017 12:23
Both are enabled by default. Except for LUA on Darwin where
compilation fails. (See NixOS#23901.)
@fuzzy-id
Copy link
Contributor Author

Done. So I guess it's time to celebrate. :)

I also made a mistake with the default values of useLua and usePcre and forgot to use the proper library. This is fixed now in the cleaned up commits. I hope I got everything alright now.

@LnL7 LnL7 merged commit 607a21b into NixOS:master Mar 31, 2017
@fuzzy-id fuzzy-id deleted the haproxy-overworked4 branch March 31, 2017 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants