haproxy: PCRE and LUA support as configurable options #24248
Conversation
`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.
PCRE is enabled by default as it brings. LUA support does not compile on Darwin (see NixOS#23901). Hence, it is disabled on this platform by default.
| haproxy = callPackage ../tools/networking/haproxy { }; | ||
| haproxy = callPackage ../tools/networking/haproxy { | ||
| useLua = if stdenv.isDarwin then false else true; | ||
| lua = if stdenv.isDarwin then null else lua5_3; |
There was a problem hiding this comment.
the conditional is not needed here
| @@ -1,4 +1,8 @@ | |||
| { stdenv, pkgs, fetchurl, openssl, zlib }: | |||
| { useLua ? false | |||
There was a problem hiding this comment.
I think using !stdenv.isDarwin here is a bit nicer then doing it top level.
There was a problem hiding this comment.
Interesting, I haven't thought that this would be possible. But I haven't read up on scoping in nix.
So this would result into a function header looking like this:
{ useLua ? !stdenv.isDarwin
, usePcre ? true
, stdenv, fetchurl
, openssl, zlib, lua5_3 ? null, pcre ? null
}:
# …lua5_3 ? null and pcre ? null look a bit strange to me but it compiles alright.
Is there anything additionally to do, to avoid recompilation when e.g. pcre changes although usePcre = false?
There was a problem hiding this comment.
Nothing will rebuild if pcre is not used in the derivation when usePcre is disabled. Adding a default for the optional packages is not strictly necessary but it makes it easier to import the file directly, another thing that's usually added in this case is an assert to make sure the package exists when the use option is enabled.
{ stdenv, openssl, zlib
, usePcre ? true, pcre ? null
, useLua ? !stdenv.isDarwin, lua ? null
}:
assert usePcre -> pcre != null;
assert useLua -> lua != null;
# ...
|
Closed in favour of #24380. |
|
Can you do a |
|
Sorry for the noise. I haven't known this option before. |
Motivation for this change
This solves #23806 and is a follow up to #23901. PCRE and LUA support are added via configurable options. Both are enabled by default, apart from LUA on Darwin where compilation breaks.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)