···26 "Python3", # only used for license checks
27 },
28 "discover": {
029 "rpm-ostree-1", # we don't have rpm-ostree (duh)
30 "Snapd", # we don't have snaps and probably never will
31 "packagekitqt6", # intentionally disabled
···26 "Python3", # only used for license checks
27 },
28 "discover": {
29+ "ApkQt", # we don't have APK (duh)
30 "rpm-ostree-1", # we don't have rpm-ostree (duh)
31 "Snapd", # we don't have snaps and probably never will
32 "packagekitqt6", # intentionally disabled
···16 usermod = lib.getExe' shadow "usermod";
17 })
1819- # Provide a better looking and more NixOS specific Samba hint
20- # Proposed upstream: https://invent.kde.org/network/kdenetwork-filesharing/-/merge_requests/56
21 ./samba-hint.patch
22 ];
23
···16 usermod = lib.getExe' shadow "usermod";
17 })
1819+ # Provide a more NixOS specific Samba hint
020 ./samba-hint.patch
21 ];
22
···1-diff --git a/samba/filepropertiesplugin/qml/MissingSambaPage.qml b/samba/filepropertiesplugin/qml/MissingSambaPage.qml
2-index 327c4a7..9e2eba7 100644
3--- a/samba/filepropertiesplugin/qml/MissingSambaPage.qml
4+++ b/samba/filepropertiesplugin/qml/MissingSambaPage.qml
5-@@ -6,20 +6,17 @@
6- import QtQuick 2.12
7- import QtQuick.Controls 2.5 as QQC2
8- import QtQuick.Layouts 1.14
9--import org.kde.kirigami 2.4 as Kirigami
10--import org.kde.filesharing.samba 1.0 as Samba
11-+import org.kde.kirigami as Kirigami
1213- // When built without packagekit we cannot do auto-installation.
14--ColumnLayout {
15-- QQC2.Label {
16-- Layout.alignment: Qt.AlignHCenter
17-- Layout.fillWidth: true
18- text: xi18nc("@info", "The <application>Samba</application> file sharing service must be installed before folders can be shared.")
19- explanation: i18n("Because this distro does not include PackageKit, we cannot show you a nice \"Install it\" button, and you will have to use your package manager to install the <command>samba</command> server package manually.")
20-- wrapMode: Text.Wrap
21-- }
22-- Item {
23-- Layout.alignment: Qt.AlignHCenter
24-- Layout.fillHeight: true // space everything up
25-+Item {
26-+ Kirigami.PlaceholderMessage {
27-+ anchors.centerIn: parent
28-+ width: parent.width - (Kirigami.Units.largeSpacing * 4)
29-+
30-+ icon.name: "dialog-error"
31-+
32+ text: xi18nc("@info", "File sharing service unavailable")
33+ explanation: i18n("Please enable the `services.samba.enable` and `services.samba.usershares.enable` options in your NixOS configuration.")
34 }
···001--- a/samba/filepropertiesplugin/qml/MissingSambaPage.qml
2+++ b/samba/filepropertiesplugin/qml/MissingSambaPage.qml
3+@@ -16,7 +16,7 @@ Item {
4+5+ icon.name: "dialog-error"
00006000007- text: xi18nc("@info", "The <application>Samba</application> file sharing service must be installed before folders can be shared.")
8- explanation: i18n("Because this distro does not include PackageKit, we cannot show you a nice \"Install it\" button, and you will have to use your package manager to install the <command>samba</command> server package manually.")
0000000000009+ text: xi18nc("@info", "File sharing service unavailable")
10+ explanation: i18n("Please enable the `services.samba.enable` and `services.samba.usershares.enable` options in your NixOS configuration.")
11 }
+1-1
pkgs/kde/gear/kdepim-addons/default.nix
···8 corrosion,
9 alpaka,
10 # provided as callPackage input to enable easier overrides through overlays
11- cargoHash ? "sha256-2t4i7lTJxVNjsU5eO6svadZBIerSyXt6BMScpEl119s=",
12}:
13mkKdeDerivation rec {
14 pname = "kdepim-addons";
···8 corrosion,
9 alpaka,
10 # provided as callPackage input to enable easier overrides through overlays
11+ cargoHash ? "sha256-5RPNVw2oYbe4U1rweYArK8G/8XoTRpgbwq6OYkaZnZk=",
12}:
13mkKdeDerivation rec {
14 pname = "kdepim-addons";