diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index 4ea87ca5372b..565f4a37c744 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -735,7 +735,7 @@ in echo "exit( \$this->getPrimaryDB()->tableExists( 'user' ) ? 1 : 0 );" | \ ${cfg.phpPackage}/bin/php ${pkg}/share/mediawiki/maintenance/run.php eval --conf ${mediawikiConfig} && \ - ${cfg.phpPackage}/bin/php ${pkg}/share/mediawiki/maintenance/install.php \ + ${cfg.phpPackage}/bin/php ${pkg}/share/mediawiki/maintenance/run.php ${pkg}/share/mediawiki/maintenance/install.php \ --confpath /tmp \ --scriptpath / \ --dbserver ${lib.escapeShellArg dbAddr} \ diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix index 8ab98a9ec81c..f5c3544abd52 100644 --- a/pkgs/by-name/me/mediawiki/package.nix +++ b/pkgs/by-name/me/mediawiki/package.nix @@ -1,6 +1,7 @@ { lib, stdenvNoCC, + fetchpatch, fetchurl, nixosTests, }: @@ -14,6 +15,19 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-4vEmsZrsQiBRoKUODGq36QTzOzmIpHudqK+/0MCiUsw="; }; + patches = [ + # Fix installation with postgres + (fetchpatch { + url = "https://gerrit.wikimedia.org/r/changes/mediawiki%2Fcore~1231289/revisions/4/patch?download"; + decode = "base64 -d"; + postFetch = '' + substituteInPlace $out \ + --replace "/Installer/" "/installer/" + ''; + hash = "sha256-bhfw5CW4EEpr2GTGda3va+EmM/vK6AqBfyoCcsSiqNQ="; + }) + ]; + postPatch = '' substituteInPlace includes/installer/CliInstaller.php \ --replace-fail '$vars = Installer::getExistingLocalSettings();' '$vars = null;'