From c327d2b7ac911fb7ec754bdc5c85c6a215f6b7ce Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Fri, 6 Oct 2023 21:17:44 +0200 Subject: plasma5Packages.kopeninghours: init --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kopeninghours.nix | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/kde/kopeninghours.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index a0e59c43d17..a3d40c53868 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -179,6 +179,7 @@ let kontact = callPackage ./kontact.nix {}; konversation = callPackage ./konversation.nix {}; kontactinterface = callPackage ./kontactinterface.nix {}; + kopeninghours = callPackage ./kopeninghours.nix {}; korganizer = callPackage ./korganizer.nix {}; kpat = callPackage ./kpat.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; diff --git a/pkgs/applications/kde/kopeninghours.nix b/pkgs/applications/kde/kopeninghours.nix new file mode 100644 index 00000000000..6a49aeea587 --- /dev/null +++ b/pkgs/applications/kde/kopeninghours.nix @@ -0,0 +1,28 @@ +{ mkDerivation +, lib +, bison +, extra-cmake-modules +, flex +, kholidays +, ki18n +}: + +mkDerivation { + pname = "kopeninghours"; + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + bison + extra-cmake-modules + flex + ]; + + buildInputs = [ + kholidays + ki18n + ]; + + meta = { + license = with lib.licenses; [ bsd3 cc0 lgpl2Plus ]; + }; +} -- cgit 1.4.1 From 6ef9b308ef1d0f9b8dbcd8ea9839945ee33794cf Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Fri, 6 Oct 2023 21:18:19 +0200 Subject: plasma5Packages.kosmindoormap: init --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/kosmindoormap.nix | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/kde/kosmindoormap.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index a3d40c53868..a1522522764 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -181,6 +181,7 @@ let kontactinterface = callPackage ./kontactinterface.nix {}; kopeninghours = callPackage ./kopeninghours.nix {}; korganizer = callPackage ./korganizer.nix {}; + kosmindoormap = callPackage ./kosmindoormap.nix {}; kpat = callPackage ./kpat.nix {}; kpimtextedit = callPackage ./kpimtextedit.nix {}; kpkpass = callPackage ./kpkpass.nix {}; diff --git a/pkgs/applications/kde/kosmindoormap.nix b/pkgs/applications/kde/kosmindoormap.nix new file mode 100644 index 00000000000..529aac48da7 --- /dev/null +++ b/pkgs/applications/kde/kosmindoormap.nix @@ -0,0 +1,30 @@ +{ mkDerivation +, lib +, bison +, extra-cmake-modules +, flex +, ki18n +, kopeninghours +, kpublictransport +}: + +mkDerivation { + pname = "kosmindoormap"; + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + bison + extra-cmake-modules + flex + ]; + + buildInputs = [ + ki18n + kopeninghours + kpublictransport + ]; + + meta = { + license = with lib.licenses; [ bsd2 bsd3 cc0 lgpl2Plus lgpl3Plus mit odbl ]; + }; +} -- cgit 1.4.1 From de570b1bb77617525ca0d5995e0d0c22dab15dc6 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Fri, 6 Oct 2023 21:18:36 +0200 Subject: libquotient: propagate required libraries, split dev output, update meta.homepage --- pkgs/development/libraries/libquotient/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 2dd4cc6663a..e154ab8eafe 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { pname = "libquotient"; version = "0.8.1.2"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "quotient-im"; repo = "libQuotient"; @@ -11,10 +13,10 @@ stdenv.mkDerivation rec { hash = "sha256-qJTikc42sFUlb4g0sAEg6v9d4k1lhbn3MZPvghm56E8="; }; - buildInputs = [ olm openssl qtbase qtmultimedia qtkeychain ]; - nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ qtbase qtkeychain olm openssl qtmultimedia ]; + cmakeFlags = [ "-DQuotient_ENABLE_E2EE=ON" ]; @@ -28,9 +30,14 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + postInstall = '' + # causes cyclic dependency but is not used + rm $out/share/ndk-modules/Android.mk + ''; + meta = with lib; { description = "A Qt5/Qt6 library to write cross-platform clients for Matrix"; - homepage = "https://matrix.org/docs/projects/sdk/quotient"; + homepage = "https://quotient-im.github.io/libQuotient/"; license = licenses.lgpl21; maintainers = with maintainers; [ colemickens matthiasbeyer ]; }; -- cgit 1.4.1 From 423302ae65f499a77a66151b6e2f4c2aebc89162 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Fri, 6 Oct 2023 21:19:00 +0200 Subject: plasma5Packages.itinerary: init --- pkgs/applications/kde/default.nix | 1 + pkgs/applications/kde/itinerary.nix | 62 +++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 pkgs/applications/kde/itinerary.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index a1522522764..32d1e71facf 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -94,6 +94,7 @@ let grantleetheme = callPackage ./grantleetheme {}; gwenview = callPackage ./gwenview.nix {}; incidenceeditor = callPackage ./incidenceeditor.nix {}; + itinerary = callPackage ./itinerary.nix {}; juk = callPackage ./juk.nix {}; k3b = callPackage ./k3b.nix {}; kaccounts-integration = callPackage ./kaccounts-integration.nix {}; diff --git a/pkgs/applications/kde/itinerary.nix b/pkgs/applications/kde/itinerary.nix new file mode 100644 index 00000000000..c08aa346cde --- /dev/null +++ b/pkgs/applications/kde/itinerary.nix @@ -0,0 +1,62 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, karchive +, kcalendarcore +, kcontacts +, kdbusaddons +, kfilemetadata +, kholidays +, kio +, kirigami-addons +, kitemmodels +, kitinerary +, kmime +, knotifications +, kosmindoormap +, kpkpass +, kpublictransport +, kunitconversion +, libquotient +, networkmanager-qt +, qqc2-desktop-style +, qtpositioning +, qtquickcontrols2 +, shared-mime-info +}: + +mkDerivation { + pname = "itinerary"; + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + extra-cmake-modules + shared-mime-info # for update-mime-database + ]; + + buildInputs = [ + karchive + kcalendarcore + kcontacts + kdbusaddons + kfilemetadata + kholidays + kio + kirigami-addons + kitemmodels + kitinerary + kmime + knotifications + kosmindoormap + kpkpass + kpublictransport + kunitconversion + libquotient + networkmanager-qt + qqc2-desktop-style + qtpositioning + qtquickcontrols2 + ]; + + meta.license = with lib.licenses; [ asl20 bsd3 cc0 lgpl2Plus ]; +} -- cgit 1.4.1 From 0722a1041e2d8748fccfcc68c7cc5fbe5b207388 Mon Sep 17 00:00:00 2001 From: Sandro Jäckel Date: Fri, 6 Oct 2023 21:24:40 +0200 Subject: plasma5Packages.neochat: cleanup dependencies that are actually part of libquotient --- pkgs/applications/kde/neochat.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/kde/neochat.nix b/pkgs/applications/kde/neochat.nix index a9661648ddf..03c6f19e68f 100644 --- a/pkgs/applications/kde/neochat.nix +++ b/pkgs/applications/kde/neochat.nix @@ -24,7 +24,6 @@ , qcoro , qqc2-desktop-style , qtgraphicaleffects -, qtkeychain , qtlocation , qtmultimedia , qtquickcontrols2 @@ -59,7 +58,6 @@ mkDerivation { olm qcoro qtgraphicaleffects - qtkeychain qtlocation qtmultimedia qtquickcontrols2 -- cgit 1.4.1