summary refs log tree commit diff
path: root/pkgs/servers/web-apps/moodle
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/servers/web-apps/moodle')
-rw-r--r--pkgs/servers/web-apps/moodle/default.nix10
-rw-r--r--pkgs/servers/web-apps/moodle/moodle-utils.nix5
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix
index 447a27ad082..bd90e908f1c 100644
--- a/pkgs/servers/web-apps/moodle/default.nix
+++ b/pkgs/servers/web-apps/moodle/default.nix
@@ -1,8 +1,8 @@
 { lib, stdenv, fetchurl, writeText, plugins ? [ ] }:
 
 let
-  version = "3.9.1";
-  stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version);
+  version = "3.11";
+  stableVersion = lib.concatStrings (lib.take 2 (lib.splitVersion version));
 
 in stdenv.mkDerivation rec {
   pname = "moodle";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url =
       "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz";
-    sha256 = "sha256-6QJDEInUQQSNj3kThQ65o2cT6JaRy0FrEKy+EcDMVvs=";
+    sha256 = "sha256-rZKY26ZPvubSr6nZ+Kguj1uKoEJbF3pEIKjjh6weyYo";
   };
 
   phpConfig = writeText "config.php" ''
@@ -52,12 +52,12 @@ in stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description =
       "Free and open-source learning management system (LMS) written in PHP";
     license = licenses.gpl3Plus;
     homepage = "https://moodle.org/";
-    maintainers = with maintainers; [ aanderse ];
+    maintainers = with maintainers; [ freezeboy ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/servers/web-apps/moodle/moodle-utils.nix b/pkgs/servers/web-apps/moodle/moodle-utils.nix
index 168482bffe6..090d87cb1ee 100644
--- a/pkgs/servers/web-apps/moodle/moodle-utils.nix
+++ b/pkgs/servers/web-apps/moodle/moodle-utils.nix
@@ -8,15 +8,16 @@ let
     configurePhase ? ":",
     buildPhase ? ":",
     buildInputs ? [ ],
+    nativeBuildInputs ? [ ],
     ...
   }:
   stdenv.mkDerivation (a // {
     name = name;
 
     inherit pluginType;
-    inherit configurePhase buildPhase;
+    inherit configurePhase buildPhase buildInputs;
 
-    buildInputs = [ unzip ] ++ buildInputs;
+    nativeBuildInputs = [ unzip ] ++ nativeBuildInputs;
 
     installPhase = ''
       runHook preInstall