-
-
Notifications
You must be signed in to change notification settings - Fork 14k
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
php: enable nts
flags by default
#194172
php: enable nts
flags by default
#194172
Conversation
5ddf48d
to
51add00
Compare
Isn't |
Friendly ping, only 10 more days until branch-off. |
I did some thinking @drupol, what do you think about this as the full set of changes? This should also address the usage of apache @aanderse. diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 3ccff8aa500..ed1426f52fb 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -18,7 +18,7 @@ let
sed -i $out/bin/apachectl -e 's|$HTTPD -t|$HTTPD -t -f /etc/httpd/httpd.conf|'
'';
- php = cfg.phpPackage.override { apacheHttpd = pkg; };
+ php = cfg.phpPackage.override { apxs2Support = true; apacheHttpd = pkg; };
phpModuleName = let
majorVersion = lib.versions.major (lib.getVersion php);
diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix
index d1b7c682955..e252e011105 100644
--- a/pkgs/development/interpreters/php/generic.nix
+++ b/pkgs/development/interpreters/php/generic.nix
@@ -43,7 +43,7 @@ let
, phpdbgSupport ? true
# Misc flags
- , apxs2Support ? !stdenv.isDarwin
+ , apxs2Support ? false
, argon2Support ? true
, cgotoSupport ? false
, embedSupport ? false |
51add00
to
353f8d6
Compare
In combination with what @etu said I think we should add something to |
I'm all hears! Please give me some directions and I'll implement it. |
Hmm... actually I misunderstood something about the |
First I thought "wait, how does that work? I didn't know one could read attributes sent in like that". It works because we already have the passthrou in place: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/interpreters/php/generic.nix#L312 I think that assertion @aanderse looks great, we should include that as well. |
353f8d6
to
4f1778b
Compare
Just added the @aanderse suggestion. |
4f1778b
to
364a7d2
Compare
Just triggering the build for PHP80 as well 🙂 @ofborg build php80 php81 |
@ofborg build php80.passthru.tests php81.passthru.tests |
This PR:
Context:
Currently, to build a
NTS
version of PHP in Nix, 2 flags needs to be updated as such:In the PR, only one flag is updated because the second flag depends on the first one.
This means that PHP will be built in
ZTS
on darwin andNTS
on the other platforms. Is this what we want?IMHO, I would prefer to not do that and I'll gladly updated this PR based on the maintainers feedback.
Description of changes
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes