diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d791636ff02f..aed5fbb7f023 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9821,6 +9821,12 @@ githubId = 27586264; name = "Tobias Schmidt"; }; + totoroot = { + name = "Matthias Thym"; + email = "git@thym.at"; + github = "totoroot"; + githubId = 39650930; + }; travisbhartwell = { email = "nafai@travishartwell.net"; github = "travisbhartwell"; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index 99b021429a65..e397743b22de 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -1,19 +1,19 @@ -{ mkDerivation, lib, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets, stdenv /* for isLinux */ }: +{ mkDerivation, lib, fetchurl, qmake, qttools, qtbase, qtsvg, qtdeclarative, qtxmlpatterns, qtwayland, qtwebsockets, stdenv, qtx11extras }: mkDerivation rec { pname = "qownnotes"; - version = "20.2.5"; + version = "21.3.2"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Can grab official version like so: - # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-20.2.5.tar.xz.sha256 - sha256 = "c26d2a86a521cd243ec0a4788e7627e91cb5877dace73d93dd7d35dd02e9e4c5"; + # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-21.3.2.tar.xz.sha256 + sha256 = "a8e8ab2ca1ef6684407adeb8fc63abcafff407a367471e053c583a1c4215e5ee"; }; nativeBuildInputs = [ qmake qttools ]; buildInputs = [ - qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets + qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras ] ++ lib.optional stdenv.isLinux qtwayland; meta = with lib; { @@ -21,7 +21,7 @@ mkDerivation rec { homepage = "https://www.qownnotes.org/"; platforms = platforms.all; - license = licenses.gpl2; - maintainers = with maintainers; [ dtzWill ]; + license = licenses.gpl2Only; + maintainers = with maintainers; [ dtzWill totoroot ]; }; }