b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #116983 from totoroot/update/qownnotes-21.3.2

Browse source
This commit is contained in:
Sandro 2021-04-02 20:34:15 +02:00 committed by GitHub
parent cc0dceb9e6 5aa1b1bac3
commit 0b971c20f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -9821,6 +9821,12 @@
githubId = 27586264; githubId = 27586264;
name = "Tobias Schmidt"; name = "Tobias Schmidt";
}; };
totoroot = {
name = "Matthias Thym";
email = "git@thym.at";
github = "totoroot";
githubId = 39650930;
};
travisbhartwell = { travisbhartwell = {
email = "nafai@travishartwell.net"; email = "nafai@travishartwell.net";
github = "travisbhartwell"; github = "travisbhartwell";

14
pkgs/applications/office/qownnotes/default.nix
View file

@ -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 { mkDerivation rec {
pname = "qownnotes"; pname = "qownnotes";
version = "20.2.5"; version = "21.3.2";
src = fetchurl { src = fetchurl {
url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz";
# Can grab official version like so: # Can grab official version like so:
# $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-20.2.5.tar.xz.sha256 # $ curl https://download.tuxfamily.org/qownnotes/src/qownnotes-21.3.2.tar.xz.sha256
sha256 = "c26d2a86a521cd243ec0a4788e7627e91cb5877dace73d93dd7d35dd02e9e4c5"; sha256 = "a8e8ab2ca1ef6684407adeb8fc63abcafff407a367471e053c583a1c4215e5ee";
}; };
nativeBuildInputs = [ qmake qttools ]; nativeBuildInputs = [ qmake qttools ];
buildInputs = [ buildInputs = [
qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtbase qtsvg qtdeclarative qtxmlpatterns qtwebsockets qtx11extras
] ++ lib.optional stdenv.isLinux qtwayland; ] ++ lib.optional stdenv.isLinux qtwayland;
meta = with lib; { meta = with lib; {
@ -21,7 +21,7 @@ mkDerivation rec {
homepage = "https://www.qownnotes.org/"; homepage = "https://www.qownnotes.org/";
platforms = platforms.all; platforms = platforms.all;
license = licenses.gpl2; license = licenses.gpl2Only;
maintainers = with maintainers; [ dtzWill ]; maintainers = with maintainers; [ dtzWill totoroot ];
}; };
} }