nixos/mediawiki: fix installer when using postgres with unix domain sockets (#481340)
This commit is contained in:
@@ -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} \
|
||||
|
||||
@@ -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;'
|
||||
|
||||
Reference in New Issue
Block a user