Merge pull request #141427 from AndersonTorres/new-mirage-im

mirage-im: 0.6.4 -> 0.7.2

pkgs/applications/networking/instant-messengers/mirage/default.nix

@@ -1,43 +1,74 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub
-, qmake, pkg-config, olm, wrapQtAppsHook
-, qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qtgraphicaleffects
-, python3Packages, pyotherside, libXScrnSaver
+{ lib
+, stdenv
+, mkDerivation
+, fetchFromGitHub
+, libXScrnSaver
+, olm
+, pkg-config
+, pyotherside
+, python3Packages
+, qmake
+, qtbase
+, qtgraphicaleffects
+, qtkeychain
+, qtmultimedia
+, qtquickcontrols2
+, wrapQtAppsHook
 }:
 
-let
-  pypkgs = with python3Packages; [
-    aiofiles filetype matrix-nio appdirs cairosvg
-    pymediainfo setuptools html-sanitizer mistune blist
-    pyotherside
-  ];
-in
 mkDerivation rec {
   pname = "mirage";
-  version = "0.6.4";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "mirukana";
     repo = pname;
     rev = "v${version}";
-    sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv";
+    sha256 = "sha256-dJS4lAXHHNUEAG75gQaS9+aQTTTj8KHqHjISioynFdY=";
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook python3Packages.wrapPython ];
-
-  buildInputs = [
-    qtbase qtmultimedia
-    qtquickcontrols2
-    qtkeychain qtgraphicaleffects
-    olm pyotherside
-    libXScrnSaver
+  nativeBuildInputs = [
+    pkg-config
+    python3Packages.wrapPython
+    qmake
+    wrapQtAppsHook
   ];
 
-  propagatedBuildInputs = pypkgs;
+  buildInputs = [
+    libXScrnSaver
+    olm
+    pyotherside
+    qtbase
+    qtgraphicaleffects
+    qtkeychain
+    qtmultimedia
+    qtquickcontrols2
+  ] ++ pythonPath;
 
-  pythonPath = pypkgs;
+  pythonPath = with python3Packages; [
+    aiofiles
+    appdirs
+    blist
+    cairosvg
+    filetype
+    html-sanitizer
+    hsluv
+    matrix-nio
+    mistune
+    plyer
+    pymediainfo
+    pyotherside
+    redbaron
+    simpleaudio
+    setuptools
+    watchgod
+  ];
 
-  qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ];
+  qmakeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "CONFIG+=qtquickcompiler"
+  ];
 
   dontWrapQtApps = true;
   postInstall = ''
@@ -48,11 +79,11 @@ mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication";
     homepage = "https://github.com/mirukana/mirage";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ colemickens ];
-    broken = stdenv.isDarwin;
+    description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication";
+    license = licenses.lgpl3Plus;
+    maintainers = with maintainers; [ colemickens AndersonTorres ];
     inherit (qtbase.meta) platforms;
+    broken = stdenv.isDarwin;
   };
 }