From cb2df0773c4afb7f772ca62530eadfdf901242db Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Fri, 19 Mar 2021 22:50:59 +0100 Subject: [PATCH 1/2] qownnotes: 20.2.5 -> 21.3.2 --- pkgs/applications/office/qownnotes/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 ]; }; } From 5aa1b1bac3da61265b59056ec61a4d7b34c9ee23 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Tue, 23 Mar 2021 20:09:57 +0100 Subject: [PATCH 2/2] maintainers: add totoroot --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dfed0146d0e5..76d21881b49b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9733,6 +9733,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";