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,62 @@
{
stdenvNoCC,
lib,
fetchFromGitLab,
gitUpdater,
testers,
cmake,
cmake-extras,
glib,
intltool,
pkg-config,
validatePkgConfig,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "lomiri-schemas";
version = "0.1.9";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-schemas";
tag = finalAttrs.version;
hash = "sha256-qdkKQpKIad7bEMaN6q79byVTipuvUFSdCZQKdMtOERo=";
};
strictDeps = true;
nativeBuildInputs = [
cmake
glib # glib-compile-schemas
pkg-config
intltool
validatePkgConfig
];
buildInputs = [
cmake-extras
glib
];
cmakeFlags = [
(lib.cmakeBool "GSETTINGS_LOCALINSTALL" true)
(lib.cmakeBool "GSETTINGS_COMPILE" true)
];
passthru = {
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
updateScript = gitUpdater { };
};
meta = {
description = "GSettings / AccountsService schema files for Lomiri";
homepage = "https://gitlab.com/ubports/development/core/lomiri-schemas";
changelog = "https://gitlab.com/ubports/development/core/lomiri-schemas/-/blob/${finalAttrs.version}/ChangeLog";
license = lib.licenses.lgpl21Plus;
teams = [ lib.teams.lomiri ];
platforms = lib.platforms.linux;
pkgConfigModules = [
"lomiri-schemas"
];
};
})

View File

@@ -0,0 +1,25 @@
From fa705235cafbeb4a016bdcb0067218b29506eb84 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 19 Jul 2024 16:22:07 +0200
Subject: [PATCH] Unset QT_QPA_PLATFORMTHEME
gtk3 value breaks Lomiri startup
---
lomiri-session.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/lomiri-session.in b/lomiri-session.in
index 50dd4cb..ffc20c4 100755
--- a/lomiri-session.in
+++ b/lomiri-session.in
@@ -55,6 +55,7 @@ dbus-update-activation-environment --systemd MALIIT_FORCE_DBUS_CONNECTION=1
dbus-update-activation-environment --systemd QT_IM_MODULE=maliit
dbus-update-activation-environment --systemd GTK_IM_MODULE=maliit
dbus-update-activation-environment --systemd QT_QPA_PLATFORM=wayland
+dbus-update-activation-environment --systemd QT_QPA_PLATFORMTHEME=
dbus-update-activation-environment --systemd SDL_VIDEODRIVER=wayland
dbus-update-activation-environment --systemd QT_WAYLAND_DISABLE_WINDOWDECORATION=1
dbus-update-activation-environment --systemd QT_ACCESSIBILITY=1
--
2.44.1

View File

@@ -0,0 +1,95 @@
{
stdenvNoCC,
lib,
fetchFromGitLab,
gitUpdater,
nixosTests,
bash,
cmake,
dbus,
deviceinfo,
inotify-tools,
lomiri,
makeWrapper,
pkg-config,
systemd,
xdg-user-dirs,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "lomiri-session";
version = "0.3";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-session";
rev = finalAttrs.version;
hash = "sha256-XduE3tPUjw/wIjFCACasxtN33KO4bDLWrpl7pZcYaAA=";
};
patches = [ ./1001-Unset-QT_QPA_PLATFORMTHEME.patch ];
postPatch = ''
substituteInPlace lomiri-session.in \
--replace-fail '/usr/libexec/Xwayland.lomiri' '${lib.getBin lomiri}/libexec/Xwayland.lomiri'
substituteInPlace systemd/CMakeLists.txt \
--replace-fail 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir DEFINE_VARIABLES prefix=''${CMAKE_INSTALL_PREFIX})'
# Inject a call to xdg-user-dirs-update, so when mediascanner2 launches, it can actually scan for files
substituteInPlace desktop/dm-lomiri-session.in \
--replace-fail '@CMAKE_INSTALL_FULL_LIBEXECDIR@/lomiri-session/run-systemd-session' '${lib.getExe' xdg-user-dirs "xdg-user-dirs-update"} && @CMAKE_INSTALL_FULL_LIBEXECDIR@/lomiri-session/run-systemd-session'
'';
nativeBuildInputs = [
cmake
makeWrapper
pkg-config
];
buildInputs = [
bash
deviceinfo
dbus
inotify-tools
lomiri
systemd
];
cmakeFlags = [
# Requires lomiri-system-compositor -> not ported to Mir 2.x yet
(lib.cmakeBool "ENABLE_TOUCH_SESSION" false)
];
postInstall = ''
patchShebangs $out/bin/lomiri-session
wrapProgram $out/bin/lomiri-session \
--prefix PATH : ${
lib.makeBinPath [
deviceinfo
inotify-tools
lomiri
]
}
'';
passthru = {
providedSessions = [
"lomiri"
# not packaged/working yet
# "lomiri-touch"
];
tests.lomiri = nixosTests.lomiri;
updateScript = gitUpdater { };
};
meta = with lib; {
description = "Integrates Lomiri desktop/touch sessions into display / session managers";
homepage = "https://gitlab.com/ubports/development/core/lomiri-session";
changelog = "https://gitlab.com/ubports/development/core/lomiri-session/-/blob/${finalAttrs.version}/ChangeLog";
license = licenses.gpl3Only;
mainProgram = "lomiri-session";
teams = [ teams.lomiri ];
platforms = platforms.linux;
};
})

View File

@@ -0,0 +1,53 @@
{
stdenvNoCC,
lib,
fetchFromGitLab,
gitUpdater,
testers,
cmake,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "lomiri-sounds";
version = "25.01";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-sounds";
rev = finalAttrs.version;
hash = "sha256-j4OUwE1z++rLsg5y2YvZktFQfOys3QjoE8Ravd1JFVA=";
};
postPatch = ''
# Doesn't need a compiler, only installs data
substituteInPlace CMakeLists.txt \
--replace 'project (lomiri-sounds)' 'project (lomiri-sounds LANGUAGES NONE)'
'';
strictDeps = true;
nativeBuildInputs = [
cmake
];
passthru = {
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
updateScript = gitUpdater { };
};
meta = with lib; {
description = "Notification and ringtone sound effects for Lomiri";
homepage = "https://gitlab.com/ubports/development/core/lomiri-sounds";
license = with licenses; [
cc-by-30
cc0
cc-by-sa-30
cc-by-40
];
teams = [ teams.lomiri ];
platforms = platforms.all;
pkgConfigModules = [
"lomiri-sounds"
];
};
})

View File

@@ -0,0 +1,49 @@
{
stdenvNoCC,
lib,
fetchFromGitLab,
gitUpdater,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "lomiri-wallpapers";
version = "20.04.0";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/lomiri-wallpapers";
rev = finalAttrs.version;
hash = "sha256-n8+vY+MPVqW6s5kSo4aEtGZv1AsjB3nNEywbmcNWfhI=";
};
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share
# release-specific wallpapers
cp -r ${lib.versions.majorMinor finalAttrs.version} $out/share/wallpapers
rm $out/share/wallpapers/.placeholder
# eternal hardwired fallback/default
install -Dm644 {.,$out/share/wallpapers}/warty-final-ubuntu.png
ln -s warty-final-ubuntu.png $out/share/wallpapers/lomiri-default-background.png
runHook postInstall
'';
passthru.updateScript = gitUpdater { };
meta = with lib; {
description = "Wallpapers for the Lomiri Operating Environment, gathered from people of the Ubuntu Touch / UBports community";
homepage = "https://gitlab.com/ubports/development/core/lomiri-wallpapers";
changelog = "https://gitlab.com/ubports/development/core/lomiri-wallpapers/-/blob/${finalAttrs.version}/ChangeLog";
# On update, recheck debian/copyright for which licenses apply to the installed images
license = with licenses; [ cc-by-sa-30 ];
teams = [ teams.lomiri ];
platforms = platforms.all;
};
})

View File

@@ -0,0 +1,67 @@
{
stdenvNoCC,
lib,
fetchFromGitLab,
gitUpdater,
gtk3,
hicolor-icon-theme,
ubuntu-themes,
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "suru-icon-theme";
version = "2025.05.0";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/suru-icon-theme";
rev = finalAttrs.version;
hash = "sha256-6MyZTRcfCpiCXzwrwNiBP6J4L4oFbFtoymhke13tLy0=";
};
# Commit 79763fa4ff701d1d89d7362c37c65b2a3cbdf543 introduced abunch of symlinks for Lomiri apps' icons to files from this theme.
# This seems to have broken Lomiri, as it now gets stuck during startup (presumably?) trying to resolve the icons of these apps in the sidebar.
# Can't apply a revert of the commit because patch refuses to touch symlinks.
postPatch = ''
for app in dekko2 lomiri-{addressbook,calculator,calendar,camera,clock,dialer,docviewer,gallery,mediaplayer,messaging,music,notes,terminal,weather}-app lomiri-system-settings lomiri-online-accounts-{facebook,flickr,google,owncloud,twitter,ubuntuones,yahoo}; do
find suru/apps -name "$app".png -exec rm -v {} \;
find suru/apps -name "$app"-symbolic.svg -exec rm -v {} \;
done
'';
strictDeps = true;
nativeBuildInputs = [
gtk3 # gtk-update-icon-cache
hicolor-icon-theme # theme setup hook
];
propagatedBuildInputs = [ ubuntu-themes ];
dontConfigure = true;
dontBuild = true;
installPhase = ''
runHook preInstall
mkdir -p $out/share/icons
cp -r suru $out/share/icons/
gtk-update-icon-cache $out/share/icons/suru
runHook postInstall
'';
dontDropIconThemeCache = true;
passthru.updateScript = gitUpdater { };
meta = {
description = "Suru Icon Theme for Lomiri Operating Environment";
homepage = "https://gitlab.com/ubports/development/core/suru-icon-theme";
changelog = "https://gitlab.com/ubports/development/core/suru-icon-theme/-/blob/${finalAttrs.version}/ChangeLog";
license = lib.licenses.cc-by-sa-30;
teams = [ lib.teams.lomiri ];
platforms = lib.platforms.all;
};
})