Unverified Commit 89921d39 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

nixos/mediawiki: fix installer when using postgres with unix domain sockets (#481340)

parents 5bec6005 7cfc7d65

nixos/modules/services/web-apps/mediawiki.nix

+1 −1
Original line number Diff line number Diff line
@@ -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} \

pkgs/by-name/me/mediawiki/package.nix

+14 −0
Original line number Diff line number Diff line 
{

  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;'