From patchwork Fri Feb 21 21:57:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Nicol=C3=B2_Balzarotti?= X-Patchwork-Id: 20347 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A21EF27BBEA; Fri, 21 Feb 2020 21:58:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id A8B7527BBE4 for ; Fri, 21 Feb 2020 21:58:13 +0000 (GMT) Received: from localhost ([::1]:36628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5GJJ-0007Ew-3T for patchwork@mira.cbaines.net; Fri, 21 Feb 2020 16:58:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38115) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5GJB-0007A7-H0 for guix-patches@gnu.org; Fri, 21 Feb 2020 16:58:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5GJ8-0005qI-Rj for guix-patches@gnu.org; Fri, 21 Feb 2020 16:58:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42322) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5GJ8-0005ps-IU for guix-patches@gnu.org; Fri, 21 Feb 2020 16:58:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j5GJ8-0006iO-Go for guix-patches@gnu.org; Fri, 21 Feb 2020 16:58:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39619] [v2] Re: bug#39619: Acknowledgement ([PATCH 0/4] Add nheko matrix client) Resent-From: =?utf-8?q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Feb 2020 21:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39619 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Goaziou Cc: 39619@debbugs.gnu.org Received: via spool by 39619-submit@debbugs.gnu.org id=B39619.158232225225767 (code B ref 39619); Fri, 21 Feb 2020 21:58:02 +0000 Received: (at 39619) by debbugs.gnu.org; 21 Feb 2020 21:57:32 +0000 Received: from localhost ([127.0.0.1]:48295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5GIZ-0006hR-4C for submit@debbugs.gnu.org; Fri, 21 Feb 2020 16:57:32 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:39682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5GIX-0006hC-16 for 39619@debbugs.gnu.org; Fri, 21 Feb 2020 16:57:26 -0500 Received: by mail-wr1-f65.google.com with SMTP id y11so3646918wrt.6 for <39619@debbugs.gnu.org>; Fri, 21 Feb 2020 13:57:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=wSor31oVKbpV6E2E1AMQcVSFMJ4XPERsAAfjQHqV2+Y=; b=MwSp1DHgxCALYgaHB+chChcCXs6QiOQXhvaIsRD4cDxLKrguKyld1k5koAyyIc6LJe uCkZ9LS/JkZgmPxAqP0EZ1dHRLTe+UX5qWdbp1j2/Y9ylsm8sms3HD2BMH7sq5mF+dLt rcGNc/R+ZYNQScZBeq3TlbYOtOnWRnodcmSCnYHSsmcB40HwTOdL9UEFY5oq4F6wA4HH WNUDAtjODa988lMffIesA4q30Is+edz3ds74fP371PYYN+vm57btj1XylcM+YiJiS53x 7ZdiwNX45KfpGA11RwG+zU2yIIxIHFDkA6HFl0DTMOpPMyb9SM7h9Y0oeWhqH/+ALOXY YMUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=wSor31oVKbpV6E2E1AMQcVSFMJ4XPERsAAfjQHqV2+Y=; b=QV0OyTBqfSgjlAQ0gwZjoG8Pj3dpJqaDrrGlBbL60dLbmAtLXr/cYPyrfwBNGt+i0p 4rpvjS+ZIvz+R7vszuUASSQpglmIX1mqjGqilcAQRClcbfVNF/JfBipXU9ZhlOuGSnPv KflgYrAzOJ19pKV/SHjl6aakdzJh/aNg8kavR5xks0TzcYLghpkPEMsQ0/z0AH/PfnF4 MpJXW8PSxHeHCNxaGiR9yuHvcUmPlzV53FEVEQNHiXCFPFw0pzNCMFk3dmGmAz2a0fPt Y4xsxmWc7xfHzNIII9zstfSuexNZp99O2vEL2wMJWbYEd8hjQUIRMb50pVY4LfZMemQc hRwA== X-Gm-Message-State: APjAAAV6J/ZciviUmPOlvecD6F9Hb0odCZkafZv8CgpVoWVND8BJHKcu gactaThz10aVxIHyLKXJHINqU9l1FKs= X-Google-Smtp-Source: APXvYqw7IzHoxCX1RYcqgng0gyXein6jhFBlBGFaK/fJ2FVnqDrUo4JlbKh2JoRQEFitu5mmel3dHg== X-Received: by 2002:a5d:4d04:: with SMTP id z4mr54501407wrt.157.1582322238565; Fri, 21 Feb 2020 13:57:18 -0800 (PST) Received: from guixSD ([95.232.154.110]) by smtp.gmail.com with ESMTPSA id h2sm5816653wrt.45.2020.02.21.13.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Feb 2020 13:57:17 -0800 (PST) From: =?utf-8?q?Nicol=C3=B2?= Balzarotti In-Reply-To: <874kvjg9n8.fsf@nicolasgoaziou.fr> References: <20200215212305.20862-1-nicolo@nixo.xyz> <87pnecs0zx.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> <874kvjg9n8.fsf@nicolasgoaziou.fr> Date: Fri, 21 Feb 2020 22:57:16 +0100 Message-ID: <87zhdbk3ib.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Nicolas Goaziou writes: Hi, > Hello, > > Nicolò Balzarotti writes: > >> I just noticed that nlohmann-json-cpp is deprecated for json-modern-cxx, >> fixed it in the two patches that were using it. > > Thank you for the patches. > thanks for your review. > Unfortunately, I cannot build nheko because of a missing lmdbxx input. > lmdbxx was patch #3, but I created some noise sending replying to guix-patches and creating multiple issues. I'm sending it again with other fixes applied. > Some comments follow. > >> + (lambda _ >> + (substitute* "CMakeLists.txt" >> + (("add_test\\(BasicConnectivity") "# add_test") >> + (("add_test\\(ClientAPI") "# add_test") >> + (("add_test\\(MediaAPI") "# add_test") >> + (("add_test\\(Encryption") "# add_test")) > > Nitpick: I suggest to use a single regexp for these. Sure, done. I'm not much confident with substitute* yet. > >> + (inputs >> + `(("boost" ,boost) >> + ("libolm" ,libolm) >> + ("libsodium" ,libsodium) >> + ("openssl" ,openssl) >> + ("json-modern-cxx" ,json-modern-cxx) >> + ("spdlog" ,spdlog) >> + ("zlib" ,zlib))) > > Could you re-order inputs alphabetically? Done > >> + (description "@code{mtxclient} is a C++ library that implements client API >> +for the Matrix protocol. It's built on to of @code{Boost.Asio}.") > > Nitpick: "It's" -> "It is". Done >> + (license license:expat))) >> + >> (define-public quaternion >> (package >> (name "quaternion") >> @@ -1795,8 +1849,8 @@ QMatrixClient project.") >> (origin >> (method git-fetch) >> (uri (git-reference >> - (url "https://github.com/QMatrixClient/Quaternion") >> - (commit version))) >> + (url "https://github.com/QMatrixClient/Quaternion") >> + (commit version))) > > This change is unrelated to the patch. Could you remove it? I'm sorry > >> + (inputs >> + `(("boost" ,boost) >> + ("cmark" ,cmark) >> + ("libolm" ,libolm) >> + ("lmdb" ,lmdb) >> + ("lmdbxx" ,lmdbxx) > > What is that? See previous comment >> + ("mtxclient" ,mtxclient) >> + ("openssl" ,openssl) >> + ("json-modern-cxx" ,json-modern-cxx) >> + ("qtbase" ,qtbase) >> + ("qtsvg" ,qtsvg) >> + ("qtmultimedia" ,qtmultimedia) >> + ("spdlog" ,spdlog) >> + ("tweeny" ,tweeny) >> + ("zlib" ,zlib))) >> + (native-inputs >> + `(("pkg-config" ,pkg-config) >> + ("qtlinguist" ,qttools))) > > Isn't it a bit confusing? I copied it from ./gnu/packages/lxqt.scm:1332: ("qtlinguist" ,qttools))) ./gnu/packages/sync.scm:193: ("qtlinguist" ,qttools))) ./gnu/packages/music.scm:279: ("qtlinguist" ,qttools))) ./gnu/packages/music.scm:4128: ("qtlinguist" ,qttools))) I can change it if needed, but I found other instances searching for "qtlinguist" as cmake complained about it. If those instances were "qttools" I would have not found it. > >> + (build-system qt-build-system) > > Nitpick: usually, build-system is above inputs and arguments. > >> + (home-page "https://github.com/Nheko-Reborn/nheko") >> + (synopsis "Desktop client for Matrix using Qt and C++14") >> + (description "@code{Nheko} want to provide a native desktop app for the >> +Matrix protocol that feels more like a mainstream chat app and less like an IRC >> +client. > > "that feels more..." sounds link marketing buzz. Maybe we could remove it. > >> +Most of the features you would expect from a chat application are missing right >> +now but we are getting close to a more feature complete client. > > I'm not sure this part is warranted either. Removed and rephrased > >> Specifically >> +there is support for: >> +@itemize >> +@item E2E encryption (text messages only: attachments are currently sent unencrypted). >> +@item User registration. >> +@item Creating, joining & leaving rooms. >> +@item Sending & receiving invites. >> +@item Sending & receiving files and emoji. >> +@item Typing notifications. >> +@item Username auto-completion. >> +@item Message & mention notifications. >> +@item Redacting messages. >> +@item Read receipts. >> +@item Basic communities support. >> +@item Room switcher (@key{ctrl-K}). >> +@item Light, Dark & System themes. >> +@end itemize\n") > > No need for the final newline. I wasn't sure, as there are dozens of instances with the newline after rep -ri --line-number '@end itemize[^\\n]' | wc -l 181 grep -ri --line-number '@end itemize\\n' | wc -l 277 I removed it, but if there's a standard, it would be better if it was respected (as for "new" contributors it's difficult to understand the right way just by looking at existing packages) Thanks, Nicolò > > Regards, > > -- > Nicolas Goaziou From 38ac0d6fe76c2202118dd6499110974062ff7232 Mon Sep 17 00:00:00 2001 From: nixo Date: Sat, 15 Feb 2020 21:08:12 +0100 Subject: [PATCH 4/4] gnu: Add nheko. * gnu/packages/messaging.scm (nheko): New variable. --- gnu/packages/messaging.scm | 76 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index df80168d7c..9e665fb08c 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2019, 2020 Brett Gilio ;;; Copyright © 2019, 2020 Timotej Lazar +;;; Copyright © 2020 Nicolò Balzarotti ;;; ;;; This file is part of GNU Guix. ;;; @@ -72,6 +73,7 @@ #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages pcre) @@ -1839,6 +1841,80 @@ QMatrixClient project.") for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (license license:expat))) +(define-public nheko + (package + (name "nheko") + (version "0.6.4") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Nheko-Reborn/nheko.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm")))) + (arguments + `(#:tests? #f ; no test target + #:configure-flags + (list + "-DCMAKE_BUILD_TYPE=Release" + "-DCMAKE_CXX_FLAGS=-fpermissive") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-Werror + (lambda _ + (substitute* "CMakeLists.txt" + (("-Werror") "")) + #t)) + (add-after 'unpack 'fix-determinism + (lambda _ + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t))))) + (build-system qt-build-system) + (inputs + `(("boost" ,boost) + ("cmark" ,cmark) + ("json-modern-cxx" ,json-modern-cxx) + ("libolm" ,libolm) + ("lmdb" ,lmdb) + ("lmdbxx" ,lmdbxx) + ("mtxclient" ,mtxclient) + ("openssl" ,openssl) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtmultimedia" ,qtmultimedia) + ("spdlog" ,spdlog) + ("tweeny" ,tweeny) + ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qtlinguist" ,qttools))) + (home-page "https://github.com/Nheko-Reborn/nheko") + (synopsis "Desktop client for Matrix using Qt and C++14") + (description "@code{Nheko} want to provide a native desktop app for the +Matrix protocol that feels more like a mainstream chat app and less like an IRC +client. + +There is support for: +@itemize +@item E2E encryption (text messages only: attachments are currently sent unencrypted). +@item User registration. +@item Creating, joining & leaving rooms. +@item Sending & receiving invites. +@item Sending & receiving files and emoji. +@item Typing notifications. +@item Username auto-completion. +@item Message & mention notifications. +@item Redacting messages. +@item Read receipts. +@item Basic communities support. +@item Room switcher (@key{ctrl-K}). +@item Light, Dark & System themes. +@end itemize") + (license license:gpl3+))) + (define-public quaternion (package (name "quaternion") -- 2.25.0