nheko: clean up (#341831)

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

···
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, asciidoc
-, pkg-config
-, boost179
-, cmark
-, coeurl
-, curl
-, kdsingleapplication
-, libevent
-, libsecret
-, lmdb
-, lmdbxx
-, mtxclient
-, nlohmann_json
-, olm
-, qtbase
-, qtimageformats
-, qtkeychain
-, qtmultimedia
-, qttools
-, qtwayland
-, re2
-, spdlog
-, wrapQtAppsHook
-, gst_all_1
-, libnice
-}:
-
-stdenv.mkDerivation rec {
-  pname = "nheko";
-  version = "0.12.0";
-
-  src = fetchFromGitHub {
-    owner = "Nheko-Reborn";
-    repo = "nheko";
-    rev = "v${version}";
-    hash = "sha256-hQb+K8ogNj/s6ZO2kgS/sZZ35y4CwMeS3lVeMYNucYQ=";
-  };
-
-  nativeBuildInputs = [
-    asciidoc
-    cmake
-    lmdbxx
-    pkg-config
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    boost179
-    cmark
-    coeurl
-    curl
-    kdsingleapplication
-    libevent
-    libsecret
-    lmdb
-    mtxclient
-    nlohmann_json
-    olm
-    qtbase
-    qtimageformats
-    qtkeychain
-    qtmultimedia
-    qttools
-    qtwayland
-    re2
-    spdlog
-  ]
-  ++ (with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-    (gst-plugins-good.override { qt6Support = true; })
-    gst-plugins-bad
-    libnice
-  ]);
-
-  cmakeFlags = [
-    "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
-  ];
-
-  preFixup = ''
-    # add gstreamer plugins path to the wrapper
-    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
-  '';
-
-  meta = with lib; {
-    description = "Desktop client for the Matrix protocol";
-    homepage = "https://github.com/Nheko-Reborn/nheko";
-    license = licenses.gpl3Plus;
-    mainProgram = "nheko";
-    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.hostPlatform.isDarwin;
-  };
-}

pkgs/by-name/co/coeurl/package.nix

···
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  ninja,
+  pkg-config,
+  meson,
+  libevent,
+  curl,
+  spdlog,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "coeurl";
+  version = "0.3.1";
+
+  src = fetchFromGitLab {
+    domain = "nheko.im";
+    owner = "nheko-reborn";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-NGplM5c/dMGSQbhKeuPOTWL8KsqvMd/76YuwCxnqNNE=";
+  };
+  postPatch = ''
+    substituteInPlace subprojects/curl.wrap --replace '[provides]' '[provide]'
+  '';
+
+  nativeBuildInputs = [
+    ninja
+    pkg-config
+    meson
+  ];
+
+  buildInputs = [
+    libevent
+    curl
+    spdlog
+  ];
+
+  meta = with lib; {
+    description = "Simple async wrapper around CURL for C++";
+    homepage = "https://nheko.im/nheko-reborn/coeurl";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ rnhmjoj ];
+  };
+}

pkgs/by-name/nh/nheko/package.nix

···
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  asciidoc,
+  pkg-config,
+  boost179,
+  cmark,
+  coeurl,
+  curl,
+  kdsingleapplication,
+  libevent,
+  libsecret,
+  lmdb,
+  lmdbxx,
+  mtxclient,
+  nlohmann_json,
+  olm,
+  re2,
+  spdlog,
+  gst_all_1,
+  libnice,
+  qt6Packages,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "nheko";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "Nheko-Reborn";
+    repo = "nheko";
+    rev = "v${version}";
+    hash = "sha256-hQb+K8ogNj/s6ZO2kgS/sZZ35y4CwMeS3lVeMYNucYQ=";
+  };
+
+  nativeBuildInputs = [
+    asciidoc
+    cmake
+    lmdbxx
+    pkg-config
+    qt6Packages.wrapQtAppsHook
+  ];
+
+  buildInputs =
+    [
+      boost179
+      cmark
+      coeurl
+      curl
+      kdsingleapplication
+      libevent
+      libsecret
+      lmdb
+      mtxclient
+      nlohmann_json
+      olm
+      qt6Packages.qtbase
+      qt6Packages.qtimageformats
+      qt6Packages.qtkeychain
+      qt6Packages.qtmultimedia
+      qt6Packages.qttools
+      qt6Packages.qtwayland
+      re2
+      spdlog
+    ]
+    ++ (with gst_all_1; [
+      gstreamer
+      gst-plugins-base
+      (gst-plugins-good.override { qt6Support = true; })
+      gst-plugins-bad
+      libnice
+    ]);
+
+  cmakeFlags = [
+    "-DCOMPILE_QML=ON" # see https://github.com/Nheko-Reborn/nheko/issues/389
+  ];
+
+  preFixup = ''
+    # add gstreamer plugins path to the wrapper
+    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
+  '';
+
+  meta = with lib; {
+    description = "Desktop client for the Matrix protocol";
+    homepage = "https://github.com/Nheko-Reborn/nheko";
+    license = licenses.gpl3Plus;
+    mainProgram = "nheko";
+    maintainers = with maintainers; [
+      ekleog
+      fpletz
+      rnhmjoj
+    ];
+    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.hostPlatform.isDarwin;
+  };
+}

pkgs/development/libraries/coeurl/default.nix

···
-{ lib
-, stdenv
-, fetchFromGitLab
-, fetchpatch
-, ninja
-, pkg-config
-, meson
-, libevent
-, curl
-, spdlog
-}:
-
-stdenv.mkDerivation rec {
-  pname = "coeurl";
-  version = "0.3.0";
-
-  src = fetchFromGitLab {
-    domain = "nheko.im";
-    owner = "nheko-reborn";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w=";
-  };
-  patches = [
-    # Fix compatibility issues with curl > 7.85, see:
-    # https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a
-    # PATCH CAN BE REMOVED AFTER 0.3.0
-    (fetchpatch {
-      url = "https://nheko.im/nheko-reborn/coeurl/-/commit/d926893007c353fbc149d8538a5762ca8384273a.patch";
-      hash = "sha256-hOBk7riuVI7k7qe/SMq3XJnFzyZ0gB9kVG7dKvWOsPY=";
-    })
-    # Fix error when building with fmt >= 10, see:
-    # https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc
-    # PATCH CAN BE REMOVED AFTER 0.3.0
-    (fetchpatch {
-      url = "https://nheko.im/nheko-reborn/coeurl/-/commit/831e2ee8e9cf08ea1ee9736cde8370f9d0312abc.patch";
-      hash = "sha256-a52Id7Nm3Mmmwv7eL58j6xovjlkpAO4KahVM/Q3H65w=";
-    })
-  ];
-  postPatch = ''
-    substituteInPlace subprojects/curl.wrap --replace '[provides]' '[provide]'
-  '';
-
-  nativeBuildInputs = [ ninja pkg-config meson ];
-
-  buildInputs = [ libevent curl spdlog ];
-
-  meta = with lib; {
-    description = "Simple async wrapper around CURL for C++";
-    homepage = "https://nheko.im/nheko-reborn/coeurl";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ rnhmjoj ];
-  };
-}

pkgs/development/libraries/mtxclient/default.nix pkgs/by-name/mt/mtxclient/package.nix

···
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, pkg-config
-, coeurl
-, curl
-, libevent
-, nlohmann_json
-, olm
-, openssl
-, re2
-, spdlog
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  coeurl,
+  curl,
+  libevent,
+  nlohmann_json,
+  olm,
+  openssl,
+  re2,
+  spdlog,
 }:
 
 stdenv.mkDerivation rec {
···
     description = "Client API library for the Matrix protocol";
     homepage = "https://github.com/Nheko-Reborn/mtxclient";
     license = licenses.mit;
-    maintainers = with maintainers; [ fpletz pstn ];
+    maintainers = with maintainers; [
+      fpletz
+      pstn
+      rnhmjoj
+    ];
     platforms = platforms.all;
     # Should be fixable if a higher clang version is used, see:
     # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177

pkgs/top-level/all-packages.nix

···
     protobuf = protobuf_21;
   };
 
-  coeurl = callPackage ../development/libraries/coeurl { };
-
   coercer = callPackage ../tools/security/coercer { };
 
   cogl = callPackage ../development/libraries/cogl {
···
   mtdev = callPackage ../development/libraries/mtdev { };
 
   mtpfs = callPackage ../tools/filesystems/mtpfs { };
-
-  mtxclient = callPackage ../development/libraries/mtxclient { };
 
   mu = callPackage ../tools/networking/mu { };
 
···
   nedit = callPackage ../applications/editors/nedit { };
 
   ngt = callPackage ../development/libraries/ngt { };
-
-  nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { };
 
   notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { };