From a9fc9e87d8389fd5c688de7419444043dcc0c2c9 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 14:17:33 +0200 Subject: [PATCH 1/6] coeurl: 0.3.0 -> 0.3.1 --- pkgs/development/libraries/coeurl/default.nix | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/development/libraries/coeurl/default.nix index 580cd488c9fd2..d2cba732fa20a 100644 --- a/pkgs/development/libraries/coeurl/default.nix +++ b/pkgs/development/libraries/coeurl/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , ninja , pkg-config , meson @@ -12,31 +11,15 @@ stdenv.mkDerivation rec { pname = "coeurl"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitLab { domain = "nheko.im"; owner = "nheko-reborn"; repo = pname; rev = "v${version}"; - hash = "sha256-sN+YSddUOdnJLcnHyWdjNm1PpxCwnkwiqSvyrwUrg6w="; + hash = "sha256-NGplM5c/dMGSQbhKeuPOTWL8KsqvMd/76YuwCxnqNNE="; }; - 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]' ''; From 9ed27f014e73590ccaf87e8c0f573c27f0dd1e62 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 14:28:10 +0200 Subject: [PATCH 2/6] coeurl: move to by-name and reformat --- .../co/coeurl/package.nix} | 31 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 20 insertions(+), 13 deletions(-) rename pkgs/{development/libraries/coeurl/default.nix => by-name/co/coeurl/package.nix} (73%) diff --git a/pkgs/development/libraries/coeurl/default.nix b/pkgs/by-name/co/coeurl/package.nix similarity index 73% rename from pkgs/development/libraries/coeurl/default.nix rename to pkgs/by-name/co/coeurl/package.nix index d2cba732fa20a..b3a24e910bda7 100644 --- a/pkgs/development/libraries/coeurl/default.nix +++ b/pkgs/by-name/co/coeurl/package.nix @@ -1,12 +1,13 @@ -{ lib -, stdenv -, fetchFromGitLab -, ninja -, pkg-config -, meson -, libevent -, curl -, spdlog +{ + lib, + stdenv, + fetchFromGitLab, + ninja, + pkg-config, + meson, + libevent, + curl, + spdlog, }: stdenv.mkDerivation rec { @@ -24,9 +25,17 @@ stdenv.mkDerivation rec { substituteInPlace subprojects/curl.wrap --replace '[provides]' '[provide]' ''; - nativeBuildInputs = [ ninja pkg-config meson ]; + nativeBuildInputs = [ + ninja + pkg-config + meson + ]; - buildInputs = [ libevent curl spdlog ]; + buildInputs = [ + libevent + curl + spdlog + ]; meta = with lib; { description = "Simple async wrapper around CURL for C++"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5e9c8fc17a49..1bec0857df1ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19180,8 +19180,6 @@ with pkgs; protobuf = protobuf_21; }; - coeurl = callPackage ../development/libraries/coeurl { }; - coercer = callPackage ../tools/security/coercer { }; cogl = callPackage ../development/libraries/cogl { From f69e61221fcd13d49df3e6b7a07c803c05dae098 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 14:50:26 +0200 Subject: [PATCH 3/6] nheko: add rnhmjoj as maintainer --- .../networking/instant-messengers/nheko/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 041a3949d92dc..b60d68f2bc12c 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Nheko-Reborn/nheko"; license = licenses.gpl3Plus; mainProgram = "nheko"; - maintainers = with maintainers; [ ekleog fpletz ]; + 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 From 9f6acaec62a15e80ed9806227a555455068bbd1d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 14:51:04 +0200 Subject: [PATCH 4/6] mtxclient: add rnhmjoj as maintainer --- pkgs/development/libraries/mtxclient/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index dff005d9eb1bc..35d0f55675fe3 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -56,7 +56,7 @@ 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 From 1b016ab476fe6e07bdfe35c58153b1c28cb0845a Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 14:56:46 +0200 Subject: [PATCH 5/6] mtxclient: move to by-name and reformat --- .../mt/mtxclient/package.nix} | 33 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 19 insertions(+), 16 deletions(-) rename pkgs/{development/libraries/mtxclient/default.nix => by-name/mt/mtxclient/package.nix} (83%) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/by-name/mt/mtxclient/package.nix similarity index 83% rename from pkgs/development/libraries/mtxclient/default.nix rename to pkgs/by-name/mt/mtxclient/package.nix index 35d0f55675fe3..2d47a07b2645e 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/by-name/mt/mtxclient/package.nix @@ -1,16 +1,17 @@ -{ 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 { @@ -56,7 +57,11 @@ 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 rnhmjoj ]; + 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bec0857df1ad..c6ccf48da478a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22160,8 +22160,6 @@ with pkgs; mtpfs = callPackage ../tools/filesystems/mtpfs { }; - mtxclient = callPackage ../development/libraries/mtxclient { }; - mu = callPackage ../tools/networking/mu { }; mueval = callPackage ../development/tools/haskell/mueval { }; From 4312e5a93c75524c8f8bfe57eb74bbb25f5aaab8 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 14 Sep 2024 15:10:18 +0200 Subject: [PATCH 6/6] nheko: move to by-name and reformat --- .../nh/nheko/package.nix} | 118 +++++++++--------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 59 insertions(+), 61 deletions(-) rename pkgs/{applications/networking/instant-messengers/nheko/default.nix => by-name/nh/nheko/package.nix} (51%) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/by-name/nh/nheko/package.nix similarity index 51% rename from pkgs/applications/networking/instant-messengers/nheko/default.nix rename to pkgs/by-name/nh/nheko/package.nix index b60d68f2bc12c..2e1bf3126d756 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/by-name/nh/nheko/package.nix @@ -1,32 +1,27 @@ -{ 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 +{ + 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 { @@ -45,37 +40,38 @@ stdenv.mkDerivation rec { cmake lmdbxx pkg-config - wrapQtAppsHook + qt6Packages.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 - ]); + 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 @@ -91,7 +87,11 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Nheko-Reborn/nheko"; license = licenses.gpl3Plus; mainProgram = "nheko"; - maintainers = with maintainers; [ ekleog fpletz rnhmjoj ]; + 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6ccf48da478a..0524c9849c44c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31589,8 +31589,6 @@ with pkgs; ngt = callPackage ../development/libraries/ngt { }; - nheko = qt6Packages.callPackage ../applications/networking/instant-messengers/nheko { }; - notepad-next = libsForQt5.callPackage ../applications/editors/notepad-next { }; notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };