push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,25 @@
From af54a2a37655df26a33bc6783cb472c38f65322f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sun, 28 Mar 2021 10:31:12 -0500
Subject: [PATCH 1/2] Remove impure smbd search path
---
src/core/ksambashare.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp
index e810ce4..7cfb4e6 100644
--- a/src/core/ksambashare.cpp
+++ b/src/core/ksambashare.cpp
@@ -61,7 +61,7 @@ KSambaSharePrivate::~KSambaSharePrivate()
bool KSambaSharePrivate::isSambaInstalled()
{
const bool daemonExists =
- !QStandardPaths::findExecutable(QStringLiteral("smbd"), {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty();
+ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty();
if (!daemonExists) {
qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd";
}
--
2.30.1

View File

@@ -0,0 +1,92 @@
{
stdenv,
lib,
mkDerivation,
extra-cmake-modules,
kdoctools,
qttools,
acl,
attr,
libkrb5,
util-linux,
karchive,
kbookmarks,
kcompletion,
kconfig,
kconfigwidgets,
kcoreaddons,
kdbusaddons,
ki18n,
kiconthemes,
kitemviews,
kjobwidgets,
knotifications,
kservice,
ktextwidgets,
kwallet,
kwidgetsaddons,
kwindowsystem,
kxmlgui,
qtbase,
qtscript,
qtx11extras,
solid,
kcrash,
kded,
}:
mkDerivation {
pname = "kio";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
buildInputs = [
karchive
kconfigwidgets
kdbusaddons
ki18n
kiconthemes
knotifications
ktextwidgets
kwallet
kwidgetsaddons
kwindowsystem
qtscript
qtx11extras
kcrash
libkrb5
]
++ lib.lists.optionals stdenv.hostPlatform.isLinux [
acl
attr # both are needed for ACL support
util-linux # provides libmount
];
propagatedBuildInputs = [
kbookmarks
kcompletion
kconfig
kcoreaddons
kitemviews
kjobwidgets
kservice
kxmlgui
qtbase
qttools
solid
]
++ lib.optionals stdenv.hostPlatform.isLinux [
kded
];
outputs = [
"out"
"dev"
];
separateDebugInfo = true;
patches = [
./0001-Remove-impure-smbd-search-path.patch
];
meta = {
homepage = "https://api.kde.org/frameworks/kio/html/";
};
}