From eeefb876afbc45a158c9dfd9b2bcc08aab5f37e5 Mon Sep 17 00:00:00 2001 From: 4825764518 <4825764518@purelymail.com> Date: Thu, 11 Aug 2022 15:50:07 -0400 Subject: [PATCH 1/2] qalculate-qt: init at 4.2.0 --- .../science/math/qalculate-qt/default.nix | 24 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/science/math/qalculate-qt/default.nix diff --git a/pkgs/applications/science/math/qalculate-qt/default.nix b/pkgs/applications/science/math/qalculate-qt/default.nix new file mode 100644 index 000000000000..b504cc67cd4b --- /dev/null +++ b/pkgs/applications/science/math/qalculate-qt/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, intltool, pkg-config, qmake, wrapQtAppsHook, libqalculate, qtbase, qttools }: + +stdenv.mkDerivation rec { + pname = "qalculate-qt"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "qalculate"; + repo = "qalculate-qt"; + rev = "v${version}"; + sha256 = "sha256-7H1nQLJBiuTj/GwojfOPpRbDseOHvLa94LK+bXvLhws="; + }; + + nativeBuildInputs = [ qmake intltool pkg-config wrapQtAppsHook ]; + buildInputs = [ libqalculate qtbase qttools ]; + + meta = with lib; { + description = "The ultimate desktop calculator"; + homepage = "http://qalculate.github.io"; + maintainers = with maintainers; [ _4825764518 ]; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f241e01fbaf4..4d644b73d59b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10264,6 +10264,8 @@ with pkgs; qalculate-gtk = callPackage ../applications/science/math/qalculate-gtk { }; + qalculate-qt = libsForQt5.callPackage ../applications/science/math/qalculate-qt { }; + qastools = libsForQt5.callPackage ../tools/audio/qastools { }; qdigidoc = libsForQt5.callPackage ../tools/security/qdigidoc { } ; From 81a4964fe0f9565cde73bf06174b92b90c4643b0 Mon Sep 17 00:00:00 2001 From: 4825764518 <4825764518@purelymail.com> Date: Thu, 11 Aug 2022 15:51:24 -0400 Subject: [PATCH 2/2] maintainers: add 4825764518 --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 651341a6eded..05d533a20faa 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -139,6 +139,16 @@ githubId = 1714287; name = "Owen Shepherd"; }; + _4825764518 = { + email = "4825764518@purelymail.com"; + matrix = "@kenzie:matrix.kenzi.dev"; + github = "4825764518"; + githubId = 100122841; + name = "Kenzie"; + keys = [{ + fingerprint = "D292 365E 3C46 A5AA 75EE B30B 78DB 7EDE 3540 794B"; + }]; + }; _6AA4FD = { email = "f6442954@gmail.com"; github = "6AA4FD";