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,45 @@
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e69150cd..c4ce7975 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -257,16 +257,16 @@ elseif(APPLE)
MACOSX_BUNDLE_INFO_PLIST ${INFO_MACOSX}
)
elseif(UNIX)
- install(TARGETS ${PROJECT_EXECUTABLE} RUNTIME DESTINATION /usr/bin)
+ install(TARGETS ${PROJECT_EXECUTABLE} RUNTIME DESTINATION bin)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/deploy/linux/serial-studio.png
- DESTINATION /usr/share/pixmaps
+ DESTINATION share/pixmaps
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/deploy/linux/serial-studio.desktop
- DESTINATION /usr/share/applications
+ DESTINATION share/applications
)
endif()
@@ -289,17 +289,6 @@ elseif(WIN32)
set(deploy_tool_options_arg --no-compiler-runtime -force-openssl --release)
endif()
-qt_generate_deploy_qml_app_script(
- TARGET ${PROJECT_EXECUTABLE}
- OUTPUT_SCRIPT deploy_script
- MACOS_BUNDLE_POST_BUILD
- NO_UNSUPPORTED_PLATFORM_ERROR
- DEPLOY_USER_QML_MODULES_ON_UNSUPPORTED_PLATFORM
- DEPLOY_TOOL_OPTIONS ${deploy_tool_options_arg}
-)
-
-install(SCRIPT ${deploy_script})
-
#-------------------------------------------------------------------------------
# Packaging
#-------------------------------------------------------------------------------
--
2.47.2

View File

@@ -0,0 +1,16 @@
diff --git a/app/qml/MainWindow/Panes/Toolbar.qml b/app/qml/MainWindow/Panes/Toolbar.qml
index 9b59c0c2..fa428a2f 100644
--- a/app/qml/MainWindow/Panes/Toolbar.qml
+++ b/app/qml/MainWindow/Panes/Toolbar.qml
@@ -320,7 +320,7 @@ Rectangle {
font: Cpp_Misc_CommonFonts.boldUiFont
Layout.minimumWidth: metrics.width + 16
Layout.maximumWidth: metrics.width + 16
- enabled: Cpp_IO_Manager.configurationOk && !Cpp_CSV_Player.isOpen && !Cpp_MQTT_Client.isSubscribed
+ enabled: Cpp_IO_Manager.configurationOk && !Cpp_CSV_Player.isOpen
text: checked ? qsTr("Disconnect") : qsTr("Connect")
icon.source: checked ? "qrc:/rcc/icons/toolbar/connect.svg" :
"qrc:/rcc/icons/toolbar/disconnect.svg"
--
2.47.2

View File

@@ -0,0 +1,59 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
qt6,
pkg-config,
}:
stdenv.mkDerivation rec {
pname = "serial-studio";
version = "3.0.6";
src = fetchFromGitHub {
owner = "Serial-Studio";
repo = "Serial-Studio";
tag = "v${version}";
hash = "sha256-q3RWy3HRs5NG0skFb7PSv8jK5pI5rtbccP8j38l8kjM=";
fetchSubmodules = true;
};
nativeBuildInputs = [
cmake
qt6.wrapQtAppsHook
pkg-config
];
buildInputs = [
qt6.qtbase
qt6.qtdeclarative
qt6.qtsvg
qt6.qtgraphs
qt6.qtlocation
qt6.qtconnectivity
qt6.qttools
qt6.qtserialport
qt6.qtpositioning
];
patches = [
./0001-CMake-Deploy-Fix.patch
./0002-Connect-Button-Fix.patch
];
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
mkdir -p $out/{Applications,bin}
mv $out/Serial-Studio.app $out/Applications
makeWrapper $out/Applications/Serial-Studio.app/Contents/MacOS/Serial-Studio $out/bin/serial-studio
'';
meta = {
description = "Multi-purpose serial data visualization & processing program";
mainProgram = "serial-studio";
homepage = "https://serial-studio.github.io/";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ sikmir ];
platforms = lib.platforms.unix;
};
}