Merge remote-tracking branch 'prism/master'

3 files changed, 28 insertions, 5 deletions

diff --git a/makefu/5pkgs/chitubox/default.nix b/makefu/5pkgs/chitubox/default.nix
index bea33e64f..d0596e700 100644
--- a/makefu/5pkgs/chitubox/default.nix
+++ b/makefu/5pkgs/chitubox/default.nix
@@ -4,26 +4,26 @@
 , libpulseaudio
 , xlibs
 , gst_all_1
-, kerberos
+, krb5
 , alsaLib
 }:
 # via https://raw.githubusercontent.com/simon-the-sourcerer-ab/chitubox/main/default.nix
 stdenv.mkDerivation rec {
   pname = "chitubox";
 
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = builtins.fetchTarball {
     #url = "https://sac.chitubox.com/software/download.do?softwareId=17839&softwareVersionId=v${version}&fileName=CHITUBOX_V${version}.tar.gz";
     url = "https://archive.org/download/chitubox-v-1.8.1.tar/CHITUBOX_V${version}.tar.gz";
-    sha256 = "08fh8w7s5qvlx6bhdg24g81a7zprq7n8m27w2vdv0cd8j0wixbsx";
+    sha256 = "1ywcizxdkwlhi8z3jshl3b6ha8iwibssxh8fk7s32h3z8vl8zcl7";
   };
   nativeBuildInputs = [ autoPatchelfHook ];
 
   buildInputs = with xlibs; [ stdenv.cc.cc.lib libglvnd libgcrypt zlib glib fontconfig freetype libdrm 
-  libxkbcommon libpulseaudio kerberos alsaLib
+  libxkbcommon libpulseaudio alsaLib
   xcbutilwm xcbutilimage xcbutilrenderutil xcbutilkeysyms
-  gst_all_1.gst-plugins-base gst_all_1.gstreamer
+  gst_all_1.gst-plugins-base gst_all_1.gstreamer krb5
 ];
 
   buildPhase = ''
diff --git a/makefu/5pkgs/custom/mediawiki-matrix-bot/default.nix b/makefu/5pkgs/custom/mediawiki-matrix-bot/default.nix
new file mode 100644
index 000000000..4a91a9161
--- /dev/null
+++ b/makefu/5pkgs/custom/mediawiki-matrix-bot/default.nix
@@ -0,0 +1,22 @@
+{ buildPythonApplication,  fetchFromGitHub, feedparser, matrix-nio, docopt, aiohttp, aiofiles,
+mypy }:
+
+buildPythonApplication rec {
+  pname = "mediawiki-matrix-bot";
+  version = "1.0.0";
+  src = fetchFromGitHub {
+    owner = "nix-community";
+    repo = "mediawiki-matrix-bot";
+    rev = "v${version}";
+    sha256 = "1923097j1xh34jmm0zhmvma614jcxaagj89c1fc1j2qyv14ybsvs";
+  };
+  propagatedBuildInputs = [
+    feedparser matrix-nio docopt aiohttp aiofiles
+  ];
+  nativeBuildInputs = [
+    mypy
+  ];
+  checkPhase = ''
+    mypy --strict mediawiki_matrix_bot
+  '';
+}
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index 756734b65..2d54455e6 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -41,6 +41,7 @@ in {
     inherit (callPackage ./devpi {}) devpi-web ;
     nodemcu-uploader = super.pkgs.callPackage ./nodemcu-uploader {};
     liveproxy = super.pkgs.python3Packages.callPackage ./custom/liveproxy {};
+    mediawiki-matrix-bot = super.pkgs.python3Packages.callPackage ./custom/mediawiki-matrix-bot {};
     hydra-check = super.pkgs.python3Packages.callPackage ./custom/hydra-check {};
     pwqgen-ger = super.pkgs.passwdqc-utils.override {
       wordset-file = super.pkgs.fetchurl {