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

mirage-im: 0.6.4 -> 0.7.2

authored by

Anderson Torres and committed by
GitHub
09cb1c10 2df18741

+59 -28
+59 -28
pkgs/applications/networking/instant-messengers/mirage/default.nix
··· 1 - { lib, stdenv, mkDerivation, fetchFromGitHub 2 - , qmake, pkg-config, olm, wrapQtAppsHook 3 - , qtbase, qtquickcontrols2, qtkeychain, qtmultimedia, qtgraphicaleffects 4 - , python3Packages, pyotherside, libXScrnSaver 1 + { lib 2 + , stdenv 3 + , mkDerivation 4 + , fetchFromGitHub 5 + , libXScrnSaver 6 + , olm 7 + , pkg-config 8 + , pyotherside 9 + , python3Packages 10 + , qmake 11 + , qtbase 12 + , qtgraphicaleffects 13 + , qtkeychain 14 + , qtmultimedia 15 + , qtquickcontrols2 16 + , wrapQtAppsHook 5 17 }: 6 18 7 - let 8 - pypkgs = with python3Packages; [ 9 - aiofiles filetype matrix-nio appdirs cairosvg 10 - pymediainfo setuptools html-sanitizer mistune blist 11 - pyotherside 12 - ]; 13 - in 14 19 mkDerivation rec { 15 20 pname = "mirage"; 16 - version = "0.6.4"; 21 + version = "0.7.2"; 17 22 18 23 src = fetchFromGitHub { 19 24 owner = "mirukana"; 20 25 repo = pname; 21 26 rev = "v${version}"; 22 - sha256 = "15x0x2rf4fzsd0zr84fq3j3ddzkgc5il8s54jpxk8wl4ah03g4nv"; 27 + sha256 = "sha256-dJS4lAXHHNUEAG75gQaS9+aQTTTj8KHqHjISioynFdY="; 23 28 fetchSubmodules = true; 24 29 }; 25 30 26 - nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook python3Packages.wrapPython ]; 31 + nativeBuildInputs = [ 32 + pkg-config 33 + python3Packages.wrapPython 34 + qmake 35 + wrapQtAppsHook 36 + ]; 27 37 28 38 buildInputs = [ 29 - qtbase qtmultimedia 39 + libXScrnSaver 40 + olm 41 + pyotherside 42 + qtbase 43 + qtgraphicaleffects 44 + qtkeychain 45 + qtmultimedia 30 46 qtquickcontrols2 31 - qtkeychain qtgraphicaleffects 32 - olm pyotherside 33 - libXScrnSaver 47 + ] ++ pythonPath; 48 + 49 + pythonPath = with python3Packages; [ 50 + aiofiles 51 + appdirs 52 + blist 53 + cairosvg 54 + filetype 55 + html-sanitizer 56 + hsluv 57 + matrix-nio 58 + mistune 59 + plyer 60 + pymediainfo 61 + pyotherside 62 + redbaron 63 + simpleaudio 64 + setuptools 65 + watchgod 34 66 ]; 35 67 36 - propagatedBuildInputs = pypkgs; 37 - 38 - pythonPath = pypkgs; 39 - 40 - qmakeFlags = [ "PREFIX=${placeholder "out"}" "CONFIG+=qtquickcompiler" ]; 68 + qmakeFlags = [ 69 + "PREFIX=${placeholder "out"}" 70 + "CONFIG+=qtquickcompiler" 71 + ]; 41 72 42 73 dontWrapQtApps = true; 43 74 postInstall = '' ··· 45 76 wrapProgram $out/bin/mirage \ 46 77 --prefix PYTHONPATH : "$PYTHONPATH" \ 47 78 "''${qtWrapperArgs[@]}" 48 - ''; 79 + ''; 49 80 50 81 meta = with lib; { 51 - description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; 52 82 homepage = "https://github.com/mirukana/mirage"; 53 - license = licenses.lgpl3; 54 - maintainers = with maintainers; [ colemickens ]; 55 - broken = stdenv.isDarwin; 83 + description = "A fancy, customizable, keyboard-operable Qt/QML+Python Matrix chat client for encrypted and decentralized communication"; 84 + license = licenses.lgpl3Plus; 85 + maintainers = with maintainers; [ colemickens AndersonTorres ]; 56 86 inherit (qtbase.meta) platforms; 87 + broken = stdenv.isDarwin; 57 88 }; 58 89 }