]> git.immae.eu Git - perso/Immae/Config/Nix.git/commitdiff
Upgrade php package for adminer
authorIsmaël Bouya <ismael.bouya@normalesup.org>
Tue, 7 Apr 2020 21:03:42 +0000 (23:03 +0200)
committerIsmaël Bouya <ismael.bouya@normalesup.org>
Tue, 7 Apr 2020 21:03:42 +0000 (23:03 +0200)
modules/private/websites/tools/tools/adminer.nix

index 52a132c5ed30e22862a2eada33d8ed9960fab917..f8928417686aee2ada2dc9509192db51f422694c 100644 (file)
@@ -1,4 +1,4 @@
-{ adminer, php73, forcePhpSocket ? null }:
+{ adminer, php74, forcePhpSocket ? null }:
 rec {
   activationScript = {
     deps = [ "httpd" ];
 rec {
   activationScript = {
     deps = [ "httpd" ];
@@ -11,18 +11,7 @@ rec {
   phpFpm = rec {
     user = apache.user;
     group = apache.group;
   phpFpm = rec {
     user = apache.user;
     group = apache.group;
-    phpPackage = (php73.override {
-      config.php.mysqlnd = true;
-      config.php.mysqli = false;
-      config.php.pdo-mysql = false;
-    }).overrideAttrs(old: rec {
-      configureFlags = old.configureFlags ++ [
-        "--with-mysqli=shared,mysqlnd"
-        ];
-    });
-    phpOptions = ''
-      extension=${phpPackage}/lib/php/extensions/mysqli.so
-    '';
+    phpPackage = php74;
     settings = {
       "listen.owner" = apache.user;
       "listen.group" = apache.group;
     settings = {
       "listen.owner" = apache.user;
       "listen.group" = apache.group;