diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-07 13:16:26 +0200 |
commit | 95b828de42adaa2f825e5588d1cccb0d6398b20a (patch) | |
tree | abfa4798c91b9932173212e7fbc6e5f7bd85f5d6 /nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | |
parent | 421ce6439c2e685065fe9c256b751225de51e0b3 (diff) | |
parent | 1ecae5c2c123c0ca615d011b9ce32f501198e7c4 (diff) | |
download | nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.gz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.bz2 nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.lz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.xz nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.tar.zst nixlib-95b828de42adaa2f825e5588d1cccb0d6398b20a.zip |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'nixos/modules/services/web-servers/apache-httpd/mediawiki.nix')
-rw-r--r-- | nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 0693ca57814a..d562bc50c82f 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -72,11 +72,11 @@ let # Unpack Mediawiki and put the config file in its root directory. mediawikiRoot = pkgs.stdenv.mkDerivation rec { - name= "mediawiki-1.20.8"; + name= "mediawiki-1.23.1"; src = pkgs.fetchurl { - url = "http://download.wikimedia.org/mediawiki/1.20/${name}.tar.gz"; - sha256 = "0yfmh5vnfbgpvicfqh7nh4hwdk4qbc6gfniv02vchkg5al0nn7ag"; + url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz"; + sha256 = "07z5j8d988cdg4ml4n0vs9fwmj0p594ibbqdid16faxwqm52dkhl"; }; skins = config.skins; @@ -93,9 +93,10 @@ let mkdir -p $out cp -r * $out cp ${mediawikiConfig} $out/LocalSettings.php - sed -i 's|/bin/bash|${pkgs.stdenv.shell}|' \ - $out/maintenance/fuzz-tester.php \ - $out/bin/ulimit.sh \ + sed -i \ + -e 's|/bin/bash|${pkgs.bash}/bin/bash|g' \ + -e 's|/usr/bin/timeout|${pkgs.coreutils}/bin/timeout|g' \ + $out/includes/limit.sh \ $out/includes/GlobalFunctions.php ''; }; |