git.iko.soy/typeable/nixpkgs
on master help sign in
moodle: update to 3.9.1

use phpEnv to provide xmlrpc

commit832d2289c3fe31669b805ccab0fde08fa84a7620 authorFinn Behrens <me@kloenk.de> dateTue 14 Jul 2020, 12:56 (6 years ago) parent7561a3d
2 files changed+10−6
nixos/modules/services/web-apps/moodle.nix+9−5 pkgs/servers/web-apps/moodle/default.nix+1−1
nixos/modules/services/web-apps/moodle.nix+9−5
@@ -40,7 +40,7 @@ let
4040 $CFG->disableupdateautodeploy = true;
4141
4242 $CFG->pathtogs = '${pkgs.ghostscript}/bin/gs';
43− $CFG->pathtophp = '${pkgs.php}/bin/php';
43+ $CFG->pathtophp = '${phpExt}/bin/php';
4444 $CFG->pathtodu = '${pkgs.coreutils}/bin/du';
4545 $CFG->aspellpath = '${pkgs.aspell}/bin/aspell';
4646 $CFG->pathtodot = '${pkgs.graphviz}/bin/dot';
@@ -55,6 +55,9 @@ let
5555
5656 mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
5757 pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
58+
59+ phpExt = pkgs.php.withExtensions
60+ ({ enabled, all }: with all; [ iconv mbstring curl openssl tokenizer xmlrpc soap ctype zip gd simplexml dom intl json sqlite3 pgsql pdo_sqlite pdo_pgsql pdo_odbc pdo_mysql pdo mysqli session zlib xmlreader fileinfo ]);
5861in
5962{
6063 # interface
@@ -222,6 +225,7 @@ in
222225
223226 services.phpfpm.pools.moodle = {
224227 inherit user group;
228+ phpPackage = phpExt;
225229 phpEnv.MOODLE_CONFIG = "${moodleConfig}";
226230 phpOptions = ''
227231 zend_extension = opcache.so
@@ -263,13 +267,13 @@ in
263267 after = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
264268 environment.MOODLE_CONFIG = moodleConfig;
265269 script = ''
266− ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/check_database_schema.php && rc=$? || rc=$?
270+ ${phpExt}/bin/php ${cfg.package}/share/moodle/admin/cli/check_database_schema.php && rc=$? || rc=$?
267271
268− [ "$rc" == 1 ] && ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/upgrade.php \
272+ [ "$rc" == 1 ] && ${phpExt}/bin/php ${cfg.package}/share/moodle/admin/cli/upgrade.php \
269273 --non-interactive \
270274 --allow-unstable
271275
272− [ "$rc" == 2 ] && ${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/install_database.php \
276+ [ "$rc" == 2 ] && ${phpExt}/bin/php ${cfg.package}/share/moodle/admin/cli/install_database.php \
273277 --agree-license \
274278 --adminpass=${cfg.initialPassword}
275279
@@ -289,7 +293,7 @@ in
289293 serviceConfig = {
290294 User = user;
291295 Group = group;
292− ExecStart = "${pkgs.php}/bin/php ${cfg.package}/share/moodle/admin/cli/cron.php";
296+ ExecStart = "${phpExt}/bin/php ${cfg.package}/share/moodle/admin/cli/cron.php";
293297 };
294298 };
295299
pkgs/servers/web-apps/moodle/default.nix+1−1
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
1111 src = fetchurl {
1212 url =
1313 "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
14− sha256 = "dffe8c1ac68938f50a987b46b0bfc74f01235d0198ac96fb4fc4f1df5bd7f4ea";
14+ sha256 = "sha256-6QJDEInUQQSNj3kThQ65o2cT6JaRy0FrEKy+EcDMVvs=";
1515 };
1616
1717 phpConfig = writeText "config.php" ''