From 957bfa5d4a92fba6a9dbae793a80568e3b7ed7c3 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Mon, 6 Jan 2020 15:20:10 +0100
Subject: ...

---
 customized/prosody.nix | 20 ++++++++++----------
 ymir.nix               |  3 +--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/customized/prosody.nix b/customized/prosody.nix
index 87f88f4b..f8633742 100644
--- a/customized/prosody.nix
+++ b/customized/prosody.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg
-, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luazlib ? null
-, withLibevent ? true, withZlib ? true
+, lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop, luaevent ? null, luadbi ? null
+, withLibevent ? true, withZlib ? true, withDBI ? true
 , withCommunityModules ? [], extraLibs ? [], extraModules ? []
 }:
 
 assert withLibevent -> luaevent != null;
-assert withZlib -> luazlib != null;
+assert withDBI -> luadbi != null;
 
 with stdenv.lib;
 
@@ -26,23 +26,23 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.9.12";
-  name = "prosody-${version}";
+  version = "0.11.3";
+  pname = "prosody";
 
   src = fetchurl {
     url = "http://prosody.im/downloads/source/${name}.tar.gz";
-    sha256 = "139yxqpinajl32ryrybvilh54ddb1q6s0ajjhlcs4a0rnwia6n8s";
+    sha256 = "11xz4milv2962qf75vrdwsvd8sy2332nf69202rmvz5989pvvnng";
   };
 
   communityModules = fetchhg {
     url = "https://hg.prosody.im/prosody-modules/";
-    rev = "9b43b7fc3558";
-    sha256 = "0rfn5hb1yhm8hs5xf3cx5szsvdvfx83a9d8zx6rdlpw54bwhkwbf";
+    rev = "b54e98d5c4a1";
+    sha256 = "0bzn92j48krb2zhp9gn5bbn5sg0qv15j5lpxfszwqdln3lpmrvzg";
   };
 
   buildInputs = [ lua5 luasocket luasec luaexpat luabitop libidn openssl makeWrapper ]
                 ++ optional withLibevent luaevent
-                ++ optional withZlib luazlib;
+                ++ optional withDBI luadbi;
 
   configureFlags = [
     "--ostype=linux"
@@ -69,6 +69,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     homepage = http://www.prosody.im;
     platforms = platforms.linux;
-    maintainers = [ maintainers.flosse ];
+    maintainers = [];
   };
 }
diff --git a/ymir.nix b/ymir.nix
index 653f5a33..bcfadf03 100644
--- a/ymir.nix
+++ b/ymir.nix
@@ -69,8 +69,7 @@ in rec {
   nixpkgs.overlays = [
     (self: super: {
       prosody = self.callPackage ./customized/prosody.nix ({
-          inherit (self.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luasec;
-          luazlib = self.lua51Packages.lua-zlib;
+          inherit (self.lua51Packages) luasocket luaexpat luafilesystem luabitop luaevent luasec luadbi;
           lua5 = pkgs.lua5_1;
           withCommunityModules = ["mod_carbons" "mod_reload_modules" "mod_csi" "mod_cloud_notify" "mod_csi_pump" "mod_smacks" "mod_track_muc_joins" "mod_watchuntrusted"];
           extraModules = [prosodyAuth];
-- 
cgit v1.2.3