Merge pull request #211064 from NixOS/backport-210471-to-release-22.11

[Backport release-22.11] nheko: 0.10.2 -> 0.11.0

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

@@ -1,30 +1,31 @@
 { lib
 , stdenv
+, mkDerivation
 , fetchFromGitHub
 , cmake
 , asciidoc
+, pkg-config
+, boost17x
 , cmark
+, coeurl
+, curl
+, libevent
+, libsecret
 , lmdb
 , lmdbxx
-, libsecret
-, mkDerivation
+, mtxclient
+, nlohmann_json
+, olm
 , qtbase
+, qtgraphicaleffects
+, qtimageformats
 , qtkeychain
 , qtmacextras
 , qtmultimedia
-, qtimageformats
-, qttools
 , qtquickcontrols2
-, qtgraphicaleffects
-, mtxclient
-, boost17x
+, qttools
+, re2
 , spdlog
-, olm
-, pkg-config
-, nlohmann_json
-, coeurl
-, libevent
-, curl
 , voipSupport ? true
 , gst_all_1
 , libnice
@@ -32,49 +33,50 @@
 
 mkDerivation rec {
   pname = "nheko";
-  version = "0.10.2";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "Nheko-Reborn";
     repo = "nheko";
     rev = "v${version}";
-    sha256 = "sha256-gid8XOZ1/hMDGNbse4GYfcAdqHiySWyy4isBgcpekIQ=";
+    hash = "sha256-4Xe3eRnDkgyYB+hUP8TBWTt+m29HVtgcqVEQUUsIpCY=";
   };
 
   nativeBuildInputs = [
-    lmdbxx
-    cmake
-    pkg-config
     asciidoc
+    cmake
+    lmdbxx
+    pkg-config
   ];
 
   buildInputs = [
-    nlohmann_json
-    mtxclient
-    olm
     boost17x
+    cmark
+    coeurl
+    curl
+    libevent
     libsecret
     lmdb
-    spdlog
-    cmark
+    mtxclient
+    nlohmann_json
+    olm
     qtbase
-    qtmultimedia
-    qtimageformats
-    qttools
-    qtquickcontrols2
     qtgraphicaleffects
+    qtimageformats
     qtkeychain
-    coeurl
-    libevent
-    curl
+    qtmultimedia
+    qtquickcontrols2
+    qttools
+    re2
+    spdlog
   ] ++ lib.optional stdenv.isDarwin qtmacextras
-    ++ lib.optionals voipSupport (with gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      (gst-plugins-good.override { qt5Support = true; })
-      gst-plugins-bad
-      libnice
-    ]);
+  ++ lib.optionals voipSupport (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    (gst-plugins-good.override { qt5Support = true; })
+    gst-plugins-bad
+    libnice
+  ]);
 
   cmakeFlags = [
     "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
@@ -88,11 +90,11 @@ mkDerivation rec {
   meta = with lib; {
     description = "Desktop client for the Matrix protocol";
     homepage = "https://github.com/Nheko-Reborn/nheko";
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ ekleog fpletz ];
     platforms = platforms.all;
     # Should be fixable if a higher clang version is used, see:
     # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177
-    broken = stdenv.targetPlatform.isDarwin;
-    license = licenses.gpl3Plus;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

pkgs/development/libraries/coeurl/default.nix

@@ -11,17 +11,18 @@
 
 stdenv.mkDerivation rec {
   pname = "coeurl";
-  version = "0.2.1";
+  version = "0.3.0";
 
   src = fetchFromGitLab {
     domain = "nheko.im";
     owner = "nheko-reborn";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-+FIxi019+jnjpo4NhBQ4tb3ObLrEStMN5YD+MrTLa2E=";
+    hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w=";
   };
 
   nativeBuildInputs = [ ninja pkg-config meson ];
+
   buildInputs = [ libevent curl spdlog ];
 
   meta = with lib; {

pkgs/development/libraries/mtxclient/default.nix

@@ -1,26 +1,28 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , fetchpatch
 , cmake
 , pkg-config
-, openssl
-, olm
-, spdlog
-, nlohmann_json
 , coeurl
-, libevent
 , curl
+, libevent
+, nlohmann_json
+, olm
+, openssl
+, re2
+, spdlog
 }:
 
 stdenv.mkDerivation rec {
   pname = "mtxclient";
-  version = "0.8.2";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "Nheko-Reborn";
     repo = "mtxclient";
     rev = "v${version}";
-    sha256 = "sha256-x2c+wZWAWYoKxSqEezoInw3SwcGo9dQNDvuq7racLBA=";
+    hash = "sha256-39tdTY2emN3/FxZxwl6dcQn1bOgybws166wqFPJl68M=";
   };
 
   postPatch = ''
@@ -39,14 +41,16 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
   ];
+
   buildInputs = [
-    spdlog
-    nlohmann_json
-    openssl
-    olm
     coeurl
-    libevent
     curl
+    libevent
+    nlohmann_json
+    olm
+    openssl
+    re2
+    spdlog
   ];
 
   meta = with lib; {