diff options
Diffstat (limited to 'pkgs/desktops')
17 files changed, 1274 insertions, 12 deletions
diff --git a/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix new file mode 100644 index 0000000000000..ae3a44f22fd03 --- /dev/null +++ b/pkgs/desktops/budgie/plugins/budgie-media-player-applet/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitHub +, glib +, meson +, ninja +, python3Packages +}: + +stdenv.mkDerivation { + pname = "budgie-media-player-applet"; + version = "1.0.0-unstable-2023-12-31"; + + src = fetchFromGitHub { + owner = "zalesyc"; + repo = "budgie-media-player-applet"; + rev = "24500be1e0a1f92968df80f8befdf896723ba8ee"; + hash = "sha256-jQgkE6vv8PIcB0MJgfsQvzMRkkMU51Gqefoa2G6YJCw="; + }; + + nativeBuildInputs = [ + glib # glib-compile-schemas + meson + ninja + python3Packages.wrapPython + ]; + + pythonPath = with python3Packages; [ + pillow + requests + ]; + + postPatch = '' + substituteInPlace meson.build --replace "/usr" "$out" + substituteInPlace meson_post_install.py --replace '"/", "usr"' "\"$out\"" + ''; + + postFixup = '' + buildPythonPath "$out $pythonPath" + patchPythonScript "$out/lib/budgie-desktop/plugins/budgie-media-player-applet/applet.py" + ''; + + meta = { + description = "Media Control Applet for the Budgie Panel"; + homepage = "https://github.com/zalesyc/budgie-media-player-applet"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ federicoschonborn ]; + }; +} diff --git a/pkgs/desktops/budgie/plugins/default.nix b/pkgs/desktops/budgie/plugins/default.nix index e096802b66004..1958a8ef9ea21 100644 --- a/pkgs/desktops/budgie/plugins/default.nix +++ b/pkgs/desktops/budgie/plugins/default.nix @@ -1,4 +1,5 @@ { callPackage }: { budgie-analogue-clock-applet = callPackage ./budgie-analogue-clock-applet { }; + budgie-media-player-applet = callPackage ./budgie-media-player-applet { }; budgie-user-indicator-redux = callPackage ./budgie-user-indicator-redux { }; } diff --git a/pkgs/desktops/cinnamon/mint-artwork/default.nix b/pkgs/desktops/cinnamon/mint-artwork/default.nix index d20be81f37a6b..7641272b0ec86 100644 --- a/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.7.9"; + version = "1.8.0"; src = fetchurl { urls = [ "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" - "https://web.archive.org/web/20231214142428/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" + "https://web.archive.org/web/20240122135036/http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz" ]; - hash = "sha256-64S7NAQtJuhSeMiSTbW2bqosL4A9M/nzmPYJI/ZAi0U="; + hash = "sha256-eCrch5IQdTd92DIqdjZFzvE4oShv3HuXfrLLUmLb0Ms="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix new file mode 100644 index 0000000000000..31ef9ed8838cb --- /dev/null +++ b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix @@ -0,0 +1,104 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, nixosTests +, cmake +, gsettings-qt +, lomiri-ui-extras +, lomiri-ui-toolkit +, pkg-config +, qmltermwidget +, qtbase +, qtdeclarative +, qtsystems +, wrapQtAppsHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-terminal-app"; + version = "2.0.2"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/apps/lomiri-terminal-app"; + rev = "v${finalAttrs.version}"; + hash = "sha256-mXbPmVcl5dL78QUp+w3o4im5ohUQCPTKWLSVqlNO0yo="; + }; + + patches = [ + # Stop usage of private qt5_use_modules function, seemingly unavailable in this package + # Remove when https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/merge_requests/103 merged & in release + (fetchpatch { + name = "0001-lomiri-terminal-app-Stop-using-qt5_use_modules.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/commit/db210c74e771a427066aebdc3a99cab6e782d326.patch"; + hash = "sha256-op4+/eo8rBRMcW6MZ0rOEFReM7JBCck1B+AsgAPyqAI="; + }) + + # Explicitly bind textdomain, don't rely on hacky workaround in LUITK + # Remove when https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/merge_requests/104 merged & in release + (fetchpatch { + name = "0002-lomiri-terminal-app-Call-i18n.bindtextdomain.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/commit/7f9d419e29043f0d0922d2ac1dce5673e2723a01.patch"; + hash = "sha256-HfIvGVbIdTasoHAfHysnzFLufQQ4lskym5HTekH+mjk="; + }) + + # Add more & correct existing usage of GNUInstallDirs variables + # Remove when https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/merge_requests/105 merged & in release + (fetchpatch { + name = "0003-lomiri-terminal-app-GNUInstallDirs-usage.patch"; + url = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/commit/fcde1f05bb442c74b1dff95917fd7594f26e97a7.patch"; + hash = "sha256-umxCMGNjyz0TVmwH0Gl0MpgjLQtkW9cHkUfpNJcoasE="; + }) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + + # Tests look abandoned - add_test in CMake code is commented out, refers to old repo structure in import paths + sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtdeclarative + qmltermwidget + + # QML + gsettings-qt + lomiri-ui-extras + lomiri-ui-toolkit + qtsystems + ]; + + cmakeFlags = [ + "-DINSTALL_TESTS=OFF" + "-DCLICK_MODE=OFF" + ]; + + passthru = { + tests.vm-test = nixosTests.terminal-emulators.lomiri-terminal-app; + updateScript = gitUpdater { + rev-prefix = "v"; + }; + }; + + meta = with lib; { + description = "A terminal app for desktop and mobile devices"; + homepage = "https://gitlab.com/ubports/development/apps/lomiri-terminal-app"; + license = licenses.gpl3Only; + mainProgram = "lomiri-terminal-app"; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/desktops/lomiri/data/lomiri-sounds/default.nix b/pkgs/desktops/lomiri/data/lomiri-sounds/default.nix new file mode 100644 index 0000000000000..1b54723b2925e --- /dev/null +++ b/pkgs/desktops/lomiri/data/lomiri-sounds/default.nix @@ -0,0 +1,47 @@ +{ stdenvNoCC +, lib +, fetchFromGitLab +, gitUpdater +, testers +, cmake +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "lomiri-sounds"; + version = "22.02"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-sounds"; + rev = finalAttrs.version; + hash = "sha256-t9JYxrJ5ICslxidHmbD1wa6n7XZMf2a+PgMLcwgsDvU="; + }; + + 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 ]; + maintainers = teams.lomiri.members; + platforms = platforms.all; + pkgConfigModules = [ + "lomiri-sounds" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix new file mode 100644 index 0000000000000..9cdb7887ee88b --- /dev/null +++ b/pkgs/desktops/lomiri/data/lomiri-wallpapers/default.nix @@ -0,0 +1,48 @@ +{ 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 ]; + maintainers = teams.lomiri.members; + platforms = platforms.all; + }; +}) diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix index 70caa9d644203..d0d9c777431e7 100644 --- a/pkgs/desktops/lomiri/default.nix +++ b/pkgs/desktops/lomiri/default.nix @@ -7,8 +7,13 @@ let packages = self: let inherit (self) callPackage; in { + #### Core Apps + lomiri-terminal-app = callPackage ./applications/lomiri-terminal-app { }; + #### Data lomiri-schemas = callPackage ./data/lomiri-schemas { }; + lomiri-sounds = callPackage ./data/lomiri-sounds { }; + lomiri-wallpapers = callPackage ./data/lomiri-wallpapers { }; suru-icon-theme = callPackage ./data/suru-icon-theme { }; #### Development tools / libraries @@ -19,6 +24,7 @@ let libusermetrics = callPackage ./development/libusermetrics { }; lomiri-api = callPackage ./development/lomiri-api { }; lomiri-app-launch = callPackage ./development/lomiri-app-launch { }; + qtmir = callPackage ./development/qtmir { }; trust-store = callPackage ./development/trust-store { }; u1db-qt = callPackage ./development/u1db-qt { }; @@ -28,14 +34,19 @@ let lomiri-settings-components = callPackage ./qml/lomiri-settings-components { }; lomiri-ui-extras = callPackage ./qml/lomiri-ui-extras { }; lomiri-ui-toolkit = callPackage ./qml/lomiri-ui-toolkit { }; + qqc2-suru-style = callPackage ./qml/qqc2-suru-style { }; #### Services biometryd = callPackage ./services/biometryd { }; + content-hub = callPackage ./services/content-hub { }; hfd-service = callPackage ./services/hfd-service { }; history-service = callPackage ./services/history-service { }; lomiri-download-manager = callPackage ./services/lomiri-download-manager { }; + lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { }; + lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { }; lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { }; mediascanner2 = callPackage ./services/mediascanner2 { }; + telephony-service = callPackage ./services/telephony-service { }; }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/lomiri/development/qtmir/default.nix b/pkgs/desktops/lomiri/development/qtmir/default.nix new file mode 100644 index 0000000000000..ba49507f3d36d --- /dev/null +++ b/pkgs/desktops/lomiri/development/qtmir/default.nix @@ -0,0 +1,160 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, testers +, cmake +, cmake-extras +, pkg-config +, wrapQtAppsHook +, gsettings-qt +, gtest +, libqtdbustest +, libqtdbusmock +, libuuid +, lomiri-api +, lomiri-app-launch +, lomiri-url-dispatcher +, lttng-ust +, mir +, process-cpp +, qtbase +, qtdeclarative +, qtsensors +, valgrind +, protobuf +, glm +, boost +, properties-cpp +, glib +, validatePkgConfig +, wayland +, xwayland +}: + +stdenv.mkDerivation (finalAttrs: { + # Not regular qtmir, experimental support for Mir 2.x + # Currently following https://gitlab.com/ubports/development/core/qtmir/-/tree/personal/mariogrip/desktop-development + pname = "qtmir-mir2"; + version = "0.7.2-unstable-2024-01-08"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/qtmir"; + rev = "ae0d87415d5c9ed2c4fd2284ba0807d23d564bb0"; + hash = "sha256-fE8ttCC0FNavs91pASGGG7k7nKVg2lD3JK0WTmCA3gM="; + }; + + outputs = [ + "out" + "dev" + ]; + + patches = [ + # Mir 2.15 compatibility patch + # Remove when https://gitlab.com/ubports/development/core/qtmir/-/merge_requests/70 merged into branch + (fetchpatch { + name = "0001-qtmir-Update-for-Mir-2.15-removals.patch"; + url = "https://gitlab.com/ubports/development/core/qtmir/-/commit/ead5cacd4d69094ab956627f4dd94ecaff1fd69e.patch"; + hash = "sha256-hUUUnYwhNH3gm76J21M8gA5okaRd/Go03ZFJ4qn0JUo="; + }) + + # Remove when https://gitlab.com/ubports/development/core/qtmir/-/merge_requests/72 merged in branch + (fetchpatch { + name = "0002-qtmir-Add-more-better-GNUInstallDirs-variables-usage.patch"; + url = "https://gitlab.com/ubports/development/core/qtmir/-/commit/87e2cd31052ce15e9625c1327807a320ee5d12af.patch"; + hash = "sha256-MTE9tHw+xJhraEO1up7dLg0UIcmfHXgWOeuyYrVu2wc="; + }) + + # Remove when https://gitlab.com/ubports/development/core/qtmir/-/merge_requests/73 merged in branch + (fetchpatch { + name = "0003-qtmir-CMakeLists-Only-require-test-dependencies-when-building-tests.patch"; + url = "https://gitlab.com/ubports/development/core/qtmir/-/commit/b7144e67bcbb4cfbd2283d5d05146fb22b7d8cd4.patch"; + hash = "sha256-Afbj40MopztchDnk6fphTYk86YrQkiK8L1e/oXiL1Mw="; + }) + + # Remove when https://gitlab.com/ubports/development/core/qtmir/-/merge_requests/74 merged in branch + (fetchpatch { + name = "0004-qtmir-CMakeLists-Drop-call-of-Qt-internal-macro.patch"; + url = "https://gitlab.com/ubports/development/core/qtmir/-/commit/8f9c599a4dbc4cf35e289157fd0c82df55b9f8d9.patch"; + hash = "sha256-SMAErXnlMtVleWRPgO4xuUI7gAAy6W18LxtgXgetRA4="; + }) + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" \ + --replace "\''${CMAKE_INSTALL_FULL_LIBDIR}/qt5/plugins/platforms" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtPluginPrefix}/platforms" \ + + substituteInPlace data/xwayland.qtmir.desktop \ + --replace '/usr/bin/Xwayland' 'Xwayland' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + glib # glib-compile-schemas + pkg-config + validatePkgConfig + wrapQtAppsHook + ]; + + buildInputs = [ + cmake-extras + boost + gsettings-qt + libuuid + lomiri-api + lomiri-app-launch + lomiri-url-dispatcher + lttng-ust + mir + process-cpp + protobuf + qtbase + qtdeclarative + qtsensors + valgrind + + glm # included by mir header + wayland # mirwayland asks for this + properties-cpp # included by l-a-l header + ]; + + propagatedBuildInputs = [ + # Needs Xwayland on PATH for desktop file, else launching X11 applications crashes qtmir + xwayland + ]; + + checkInputs = [ + gtest + libqtdbustest + libqtdbusmock + ]; + + cmakeFlags = [ + (lib.cmakeBool "NO_TESTS" (!finalAttrs.finalPackage.doCheck)) + (lib.cmakeBool "WITH_MIR2" true) + ]; + + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + # Tests currently unavailable when building with Mir2 + doCheck = false; + + passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + + meta = with lib; { + description = "QPA plugin to make Qt a Mir server"; + homepage = "https://gitlab.com/ubports/development/core/qtmir"; + license = licenses.lgpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "qtmirserver" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/development/trust-store/default.nix b/pkgs/desktops/lomiri/development/trust-store/default.nix index 477cdd0511f86..845e2d0ee59d3 100644 --- a/pkgs/desktops/lomiri/development/trust-store/default.nix +++ b/pkgs/desktops/lomiri/development/trust-store/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "trust-store"; - version = "unstable-2023-10-17"; + version = "0-unstable-2023-12-27"; src = fetchFromGitLab { owner = "ubports"; repo = "development/core/trust-store"; - rev = "7aa7ab5b7f3843e24c13ae6d9b8607455296d60e"; - hash = "sha256-j+4FZzbG3qh1pGRapFuuMiwT4Lv9P6Ji9/3Z0uGvXmw="; + rev = "c91e5ac54c4032525f930f0651d673ad3a1095a2"; + hash = "sha256-zqs40tKo2AOd9yL2Xfbk52Uh8hy4uT1XDT6YtKufAaY="; }; outputs = [ @@ -86,8 +86,10 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ # Requires mirclient API, unavailable in Mir 2.x # https://gitlab.com/ubports/development/core/trust-store/-/issues/2 - "-DTRUST_STORE_MIR_AGENT_ENABLED=OFF" - "-DTRUST_STORE_ENABLE_DOC_GENERATION=ON" + (lib.cmakeBool "TRUST_STORE_MIR_AGENT_ENABLED" false) + (lib.cmakeBool "TRUST_STORE_ENABLE_DOC_GENERATION" true) + # error: moving a temporary object prevents copy elision + (lib.cmakeBool "ENABLE_WERROR" false) ]; # Not working diff --git a/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix new file mode 100644 index 0000000000000..5717ae35f1139 --- /dev/null +++ b/pkgs/desktops/lomiri/qml/qqc2-suru-style/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, lib +, fetchFromGitLab +, gitUpdater +, qmake +, qtdeclarative +, qtquickcontrols2 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qqc2-suru-style"; + version = "0.20230206"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/qqc2-suru-style"; + rev = finalAttrs.version; + hash = "sha256-ZLPuXnhlR1IDhGnprcdWHLnOeS6ZzVkFhQML0iKMjO8="; + }; + + # QMake can't find Qt modules from buildInputs + strictDeps = false; + + nativeBuildInputs = [ + qmake + ]; + + buildInputs = [ + qtdeclarative + qtquickcontrols2 + ]; + + dontWrapQtApps = true; + + passthru.updateScript = gitUpdater { }; + + meta = with lib; { + description = "Suru Style for QtQuick Controls 2"; + homepage = "https://gitlab.com/ubports/development/core/qqc2-suru-style"; + changelog = "https://gitlab.com/ubports/development/core/qqc2-suru-style/-/blob/${finalAttrs.version}/ChangeLog"; + license = with licenses; [ gpl2Plus lgpl3Only cc-by-sa-30 ]; + maintainers = teams.lomiri.members; + platforms = platforms.unix; + }; +}) diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix index c8d0da9a65c2e..e0f221313a430 100644 --- a/pkgs/desktops/lomiri/services/biometryd/default.nix +++ b/pkgs/desktops/lomiri/services/biometryd/default.nix @@ -56,6 +56,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://gitlab.com/OPNA2608/biometryd/-/commit/9e52fad0139c5a45f69e6a6256b2b5ff54f77740.patch"; hash = "sha256-DZSdzKq6EYgAllKSDgkGk2g57zHN+gI5fOoj7U5AcKY="; }) + + # Fix GCC13 & musl compat + # Remove when version > 0.3.0 + (fetchpatch { + url = "https://gitlab.com/ubports/development/core/biometryd/-/commit/bc6f1a743dbb0eda6310bd13229f650be62aa3b3.patch"; + hash = "sha256-Pr3zHrMNxTKYHsqHEcVv4fYVknjUwBFRTSuBxZhqUi8="; + }) ]; postPatch = '' diff --git a/pkgs/desktops/lomiri/services/content-hub/default.nix b/pkgs/desktops/lomiri/services/content-hub/default.nix new file mode 100644 index 0000000000000..6fb05b445ed83 --- /dev/null +++ b/pkgs/desktops/lomiri/services/content-hub/default.nix @@ -0,0 +1,179 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, fetchpatch2 +, gitUpdater +, testers +, cmake +, cmake-extras +, dbus-test-runner +, gettext +, glib +, gsettings-qt +, gtest +, libapparmor +, libnotify +, lomiri-api +, lomiri-app-launch +, lomiri-download-manager +, lomiri-ui-toolkit +, pkg-config +, properties-cpp +, qtbase +, qtdeclarative +, qtfeedback +, qtgraphicaleffects +, wrapGAppsHook +, xvfb-run +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "content-hub"; + version = "1.1.0"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/content-hub"; + rev = finalAttrs.version; + hash = "sha256-IntEpgPCBmOL6K6TU+UhgGb6OHVA9pYurK5VN3woIIw="; + }; + + outputs = [ + "out" + "dev" + "examples" + ]; + + patches = [ + # Remove when https://gitlab.com/ubports/development/core/content-hub/-/merge_requests/33 merged & in release + (fetchpatch { + name = "0001-content-hub-Migrate-to-GetConnectionCredentials.patch"; + url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/9c0eae42d856b4b6e24fa609ade0e674c7a84cfe.patch"; + hash = "sha256-IWoCQKSCCk26n7133oG0Ht+iEjavn/IiOVUM+tCLX2U="; + }) + + # Remove when https://gitlab.com/ubports/development/core/content-hub/-/merge_requests/34 merged & in release + (fetchpatch { + name = "0002-content-hub-import-Lomiri-Content-CMakeLists-Drop-qt-argument-to-qmlplugindump.patch"; + url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/63a4baf1469de31c4fd50c69ed85d061f5e8e80a.patch"; + hash = "sha256-T+6T9lXne6AhDFv9d7L8JNwdl8f0wjDmvSoNVPkHza4="; + }) + + # Remove when https://gitlab.com/ubports/development/core/content-hub/-/merge_requests/35 merged & in release + # fetchpatch2 due to renames, https://github.com/NixOS/nixpkgs/issues/32084 + (fetchpatch2 { + name = "0003-content-hub-Add-more-better-GNUInstallDirs-variables-usage.patch"; + url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/3c5ca4a8ec125e003aca78c14521b70140856c25.patch"; + hash = "sha256-kYN0eLwMyM/9yK+zboyEsoPKZMZ4SCXodVYsvkQr2F8="; + }) + ]; + + postPatch = '' + substituteInPlace import/*/Content/CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + + # Look for peer files in running system + substituteInPlace src/com/lomiri/content/service/registry-updater.cpp \ + --replace '/usr' '/run/current-system/sw' + + # Don't override default theme search path (which honours XDG_DATA_DIRS) with a FHS assumption + substituteInPlace import/Lomiri/Content/contenthubplugin.cpp \ + --replace 'QIcon::setThemeSearchPaths(QStringList() << ("/usr/share/icons/"));' "" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + pkg-config + qtdeclarative # qmlplugindump + wrapGAppsHook + ]; + + buildInputs = [ + cmake-extras + glib + gsettings-qt + libapparmor + libnotify + lomiri-api + lomiri-app-launch + lomiri-download-manager + lomiri-ui-toolkit + properties-cpp + qtbase + qtdeclarative + qtfeedback + qtgraphicaleffects + ]; + + nativeCheckInputs = [ + dbus-test-runner + xvfb-run + ]; + + checkInputs = [ + gtest + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + (lib.cmakeBool "GSETTINGS_COMPILE" true) + (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "ENABLE_DOC" false) # needs Qt5 qdoc: https://github.com/NixOS/nixpkgs/pull/245379 + (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) # in case something still depends on it + ]; + + preBuild = let + listToQtVar = list: suffix: lib.strings.concatMapStringsSep ":" (drv: "${lib.getBin drv}/${suffix}") list; + in '' + # Executes qmlplugindump + export QT_PLUGIN_PATH=${listToQtVar [ qtbase ] qtbase.qtPluginPrefix} + export QML2_IMPORT_PATH=${listToQtVar [ qtdeclarative lomiri-ui-toolkit qtfeedback qtgraphicaleffects ] qtbase.qtQmlPrefix} + ''; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # Starts & talks to D-Bus services, breaks under parallelism + enableParallelChecking = false; + + preFixup = '' + for exampleExe in content-hub-test-{importer,exporter,sharer}; do + moveToOutput bin/$exampleExe $examples + moveToOutput share/applications/$exampleExe.desktop $examples + done + moveToOutput share/icons $examples + ''; + + postFixup = '' + for exampleBin in $examples/bin/*; do + wrapGApp $exampleBin + done + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Content sharing/picking service"; + longDescription = '' + content-hub is a mediation service to let applications share content between them, + even if they are not running at the same time. + ''; + homepage = "https://gitlab.com/ubports/development/core/content-hub"; + license = with licenses; [ gpl3Only lgpl3Only ]; + mainProgram = "content-hub-service"; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "libcontent-hub" + "libcontent-hub-glib" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix new file mode 100644 index 0000000000000..ccabf1da7eca6 --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-indicator-network/default.nix @@ -0,0 +1,148 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, nixosTests +, testers +, cmake +, cmake-extras +, coreutils +, dbus +, doxygen +, gettext +, glib +, gmenuharness +, gtest +, intltool +, libsecret +, libqofono +, libqtdbusmock +, libqtdbustest +, lomiri-api +, lomiri-url-dispatcher +, networkmanager +, ofono +, pkg-config +, python3 +, qtdeclarative +, qtbase +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-indicator-network"; + version = "1.0.1"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-indicator-network"; + rev = finalAttrs.version; + hash = "sha256-rJKWhW082ndVPEQHjuSriKtl0zQw86adxiINkZQq1hY="; + }; + + outputs = [ + "out" + "dev" + "doc" + ]; + + patches = [ + # Remove when version > 1.0.1 + (fetchpatch { + name = "0001-lomiri-indicator-network-Make-less-assumptions-about-where-files-will-end-up.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/commit/065212b22ab9aa8d25a61b5482ad6511e4c8510b.patch"; + hash = "sha256-WrDTBKusK1808W8LZRGWaTOExu7gKpYBvkQ8hzoHoHk="; + }) + + # Remove when version > 1.0.1 + (fetchpatch { + name = "0002-lomiri-indicator-network-Honour-CMAKE_INSTALL_DOCDIR_fordocumentation-installation.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-indicator-network/-/commit/79b9e12313f765ab6e95b4d4dfefbdbca50ef3c6.patch"; + hash = "sha256-vRfdegEi892UlrC9c1+5Td7CHLh7u0foPggLNBfc8lw="; + }) + ]; + + postPatch = '' + # Queried via pkg-config, would need to override a prefix variable + # Needs CMake 3.28 or higher to do as part of the call, https://github.com/NixOS/nixpkgs/pull/275284 + substituteInPlace data/CMakeLists.txt \ + --replace 'pkg_get_variable(DBUS_SESSION_BUS_SERVICES_DIR dbus-1 session_bus_services_dir)' 'set(DBUS_SESSION_BUS_SERVICES_DIR "''${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/services")' \ + --replace 'pkg_get_variable(SYSTEMD_USER_DIR systemd systemduserunitdir)' 'set(SYSTEMD_USER_DIR "''${CMAKE_INSTALL_PREFIX}/lib/systemd/user")' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + doxygen + gettext + intltool + pkg-config + qtdeclarative + ]; + + buildInputs = [ + cmake-extras + dbus + glib + libqofono + libsecret + lomiri-api + lomiri-url-dispatcher + networkmanager + ofono + qtbase + ]; + + nativeCheckInputs = [ + (python3.withPackages (ps: with ps; [ + python-dbusmock + ])) + ]; + + checkInputs = [ + gmenuharness + gtest + libqtdbusmock + libqtdbustest + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "GSETTINGS_COMPILE" true) + (lib.cmakeBool "ENABLE_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "ENABLE_UBUNTU_COMPAT" true) # just in case something needs it + (lib.cmakeBool "BUILD_DOC" true) # lacks QML docs, needs qdoc: https://github.com/NixOS/nixpkgs/pull/245379 + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + postInstall = '' + substituteInPlace $out/etc/dbus-1/services/com.lomiri.connectivity1.service \ + --replace '/bin/false' '${lib.getExe' coreutils "false"}' + ''; + + passthru = { + ayatana-indicators = [ + "lomiri-indicator-network" + ]; + tests = { + pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + vm = nixosTests.ayatana-indicators; + }; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Ayatana indiator exporting the network settings menu through D-Bus"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-indicator-network"; + license = licenses.gpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "lomiri-connectivity-qt1" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix new file mode 100644 index 0000000000000..19741c616d72f --- /dev/null +++ b/pkgs/desktops/lomiri/services/lomiri-thumbnailer/default.nix @@ -0,0 +1,233 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, gitUpdater +, testers +, boost +, cmake +, cmake-extras +, doxygen +, gst_all_1 +, gdk-pixbuf +, gtest +, makeFontsConf +, libapparmor +, libexif +, libqtdbustest +, librsvg +, lomiri-api +, persistent-cache-cpp +, pkg-config +, python3 +, qtbase +, qtdeclarative +, shared-mime-info +, taglib +, validatePkgConfig +, wrapGAppsHook +, xvfb-run +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "lomiri-thumbnailer"; + version = "3.0.2"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/lomiri-thumbnailer"; + rev = finalAttrs.version; + hash = "sha256-AZoXTE4ix/NDBSwPJcod+cMNnfrCxFj5IzxCWxh6uq0="; + }; + + outputs = [ + "out" + "dev" + "doc" + ]; + + patches = [ + # Remove when version > 3.0.2 + (fetchpatch { + name = "0001-lomiri-thumbnailer-Stop-using-qt5_use_modules.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/a0d81863f3f48717507cfa181030a8ffb0c4e881.patch"; + hash = "sha256-B0935Hve5zYA3aUqr0RUtJsOAsfDAF/L7/20F4I+5s0="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/19 merged & in release + (fetchpatch { + name = "0002-lomiri-thumbnailer-Add-more-better-GNUInstallDirs-variables-usage.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/0b9795a6313fd025d5646f2628a2cbb3104b0ebc.patch"; + hash = "sha256-br99n2nDLjUfnjbjhOsWlvP62VmVjYeZ6yPs1dhPN/s="; + }) + + # Remove when version > 3.0.2 + (fetchpatch { + name = "0003-lomiri-thumbnailer-Fix-check-for-No-such-file-or-directory-error.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/de8f9175830581e9180ed789b92dffbb08dfe436.patch"; + hash = "sha256-JHoYTATbR8NTsVU2+8+R2sCSU6ZDLyKgmdbt4VZPv3Q="; + }) + + # Remove when version > 3.0.2 + (fetchpatch { + name = "0004-lomiri-thumbnailer-tests-headers-CMakelists.txt-Remove-extra-slash-in-include-paths.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/3598fdc84ded8241f273c89c95371d4675690e38.patch"; + hash = "sha256-Sonjc/a6hfuXhaus2scfmPfgIYWxsRD/1/IIACLqsBA="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/22 merged & in release + (fetchpatch { + name = "0005-lomiri-thumbnailer-Make-tests-optional.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/df7a3d1689f875d207a90067b957e888160491b9.patch"; + hash = "sha256-gVxigpSL/3fXNdJBjh8Ex3/TYmQUiwRji/NmLW/uhE4="; + }) + + # Remove when https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/merge_requests/23 merged & in release + (fetchpatch { + name = "0006-lomiri-thumbnailer-doc-liblomiri-thumbnailer-qt-Honour-CMAKE_INSTALL_DOCDIR.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/930a3b57e899f6eb65a96d096edaea6a6f6b242a.patch"; + hash = "sha256-klYycUoQqA+Dfk/4fRQgdS4/G4o0sC1k98mbtl0iHkE="; + }) + (fetchpatch { + name = "0007-lomiri-thumbnailer-Re-enable-documentation.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/2f9186f71fdd25e8a0852073f1da59ba6169cf3f.patch"; + hash = "sha256-youaJfCeYVpLmruHMupuUdl0c/bSDPWqKPLgu5plBrw="; + }) + (fetchpatch { + name = "0008-lomiri-thumbnailer-doc-liblomiri-thumbnailer-qt-examples-Drop-qt5_use_modules-usage.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/9e5cf09de626e73e6b8f180cbc1160ebd2f169e7.patch"; + hash = "sha256-vfNCN7tqq6ngzNmb3qqHDHaDx/kI8/UXyyv7LqUWya0="; + }) + (fetchpatch { + name = "0009-lomiri-thumbnailer-Re-enable-coverge-reporting.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/6a48831f042cd3ad34200f32800393d4eec2f84b.patch"; + hash = "sha256-HZd4K0R1W6adOjKy7tODfQAD+9IKPcK0DnH1uKNd/Ak="; + }) + (fetchpatch { + name = "0010-lomiri-thumbnailer-Make-GTest-available-to-example-test.patch"; + url = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/commit/657be3bd1aeb227edc04e26b597b2fe97b2dc51a.patch"; + hash = "sha256-XEvdWV3JJujG16+87iewYor0jFK7NTeE5459iT96SkU="; + }) + ]; + + postPatch = '' + patchShebangs tools/{parse-settings.py,run-xvfb.sh} tests/{headers,whitespace,server}/*.py + + substituteInPlace tests/thumbnailer-admin/thumbnailer-admin_test.cpp \ + --replace '/usr/bin/test' 'test' + + substituteInPlace plugins/*/Thumbnailer*/CMakeLists.txt \ + --replace "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" + + # I think this variable fails to be populated because of our toolchain, while upstream uses Debian / Ubuntu where this works fine + # https://cmake.org/cmake/help/v3.26/variable/CMAKE_LIBRARY_ARCHITECTURE.html + # > If the <LANG> compiler passes to the linker an architecture-specific system library search directory such as + # > <prefix>/lib/<arch> this variable contains the <arch> name if/as detected by CMake. + substituteInPlace tests/qml/CMakeLists.txt \ + --replace 'CMAKE_LIBRARY_ARCHITECTURE' 'CMAKE_SYSTEM_PROCESSOR' \ + --replace 'powerpc-linux-gnu' 'ppc' \ + --replace 's390x-linux-gnu' 's390x' + + # Tests run in parallel to other builds, don't suck up cores + substituteInPlace tests/headers/compile_headers.py \ + --replace 'max_workers=multiprocessing.cpu_count()' "max_workers=1" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + doxygen + gdk-pixbuf # setup hook + pkg-config + (python3.withPackages (ps: with ps; lib.optionals finalAttrs.doCheck [ + python-dbusmock + tornado + ])) + validatePkgConfig + wrapGAppsHook + ]; + + buildInputs = [ + boost + cmake-extras + gdk-pixbuf + libapparmor + libexif + librsvg + lomiri-api + persistent-cache-cpp + qtbase + qtdeclarative + shared-mime-info + taglib + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + # maybe add ugly to cover all kinds of formats? + ]); + + nativeCheckInputs = [ + shared-mime-info + xvfb-run + ]; + + checkInputs = [ + gtest + libqtdbustest + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) + (lib.cmakeBool "GSETTINGS_COMPILE" true) + # error: use of old-style cast to 'std::remove_reference<_GstElement*>::type' {aka 'struct _GstElement*'} + (lib.cmakeBool "Werror" false) + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [ + # QSignalSpy tests in QML suite always fail, pass when running interactively + "-E" "^qml" + ])) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + enableParallelChecking = false; + + preCheck = '' + # Fontconfig warnings breaks some tests + export FONTCONFIG_FILE=${makeFontsConf { fontDirectories = []; }} + export HOME=$TMPDIR + + # Some tests need Qt plugins + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + + # QML tests need QML modules + export QML2_IMPORT_PATH=${lib.getBin qtdeclarative}/${qtbase.qtQmlPrefix} + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : ${lib.makeSearchPath "share" [ shared-mime-info ]} + ) + ''; + + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "D-Bus service for out of process thumbnailing"; + homepage = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer"; + changelog = "https://gitlab.com/ubports/development/core/lomiri-thumbnailer/-/blob/${finalAttrs.version}/ChangeLog"; + license = with licenses; [ gpl3Only lgpl3Only ]; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + pkgConfigModules = [ + "liblomiri-thumbnailer-qt" + ]; + }; +}) diff --git a/pkgs/desktops/lomiri/services/telephony-service/default.nix b/pkgs/desktops/lomiri/services/telephony-service/default.nix new file mode 100644 index 0000000000000..dd6966fccf10e --- /dev/null +++ b/pkgs/desktops/lomiri/services/telephony-service/default.nix @@ -0,0 +1,227 @@ +{ stdenv +, lib +, fetchFromGitLab +, fetchpatch +, fetchpatch2 +, gitUpdater +, nixosTests +, ayatana-indicator-messages +, bash +, cmake +, dbus +, dbus-glib +, dbus-test-runner +, dconf +, gettext +, glib +, gnome +, history-service +, libnotify +, libphonenumber +, libpulseaudio +, libusermetrics +, lomiri-ui-toolkit +, lomiri-url-dispatcher +, makeWrapper +, pkg-config +, protobuf +, python3 +, qtbase +, qtdeclarative +, qtfeedback +, qtmultimedia +, qtpim +, telepathy +, telepathy-glib +, telepathy-mission-control +, xvfb-run +}: + +let + replaceDbusService = pkg: name: "--replace \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\""; +in +stdenv.mkDerivation (finalAttrs: { + pname = "telephony-service"; + version = "0.5.2"; + + src = fetchFromGitLab { + owner = "ubports"; + repo = "development/core/telephony-service"; + rev = finalAttrs.version; + hash = "sha256-9KxM8UWTIBpMMPosar2ZV9W35WmCLIWXD1ulWtqCKxM="; + }; + + patches = [ + # Remove when version > 0.5.2 + (fetchpatch { + name = "0001-telephony-service-CMakeLists-Fix-Cross-conditional-for-QT_INSTALL_QML-determining.patch"; + url = "https://gitlab.com/ubports/development/core/telephony-service/-/commit/c19463444af257c263f35127284d9787f3522f1f.patch"; + hash = "sha256-Dr/uev/z4pEiV4/QRmQ15+6wrD8rh+8vRcfWIi8FBCU="; + }) + + # Remove when version > 0.5.2 + (fetchpatch { + name = "0002-telephony-service-tests-libtelephonyservice-CMakeLists-Fix-ProtocolTest-build.patch"; + url = "https://gitlab.com/ubports/development/core/telephony-service/-/commit/d8f0f38f8b723569c03d601ac803b079ed51d09e.patch"; + hash = "sha256-asDEzh8Yg6LXl6fdwan6IhwLEuzmDfmHI+pjpxJRbeE="; + }) + + # Remove when https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/89 merged & in release + (fetchpatch2 { + name = "0003-telephony-service-Add-more-better-GNUInstallDirs-variables-usage.patch"; + url = "https://gitlab.com/ubports/development/core/telephony-service/-/commit/9a35a50c587ebfdfb1e08b54ffec0d2e6fef1950.patch"; + hash = "sha256-jGeJlwbyVr0WkyGKY7Lw5dY/V9yN43DpZmuli6oRho0="; + }) + + # Remove when https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/90 merged & in release + (fetchpatch { + name = "0004-telephony-service-CMakeLists-Make-tests-optional.patch"; + url = "https://gitlab.com/ubports/development/core/telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch"; + hash = "sha256-Za4ZGKnw9iz2RP1LzLhKrEJ1vLUufWk8J07LmWDW40E="; + }) + + # libphonenumber -> protobuf -> abseil-cpp demands C++14 + # But uses std::string_view which is C++17? + # Remove when version > 0.5.2 + (fetchpatch { + name = "0005-telephony-service-Upgrade-C++-standard-to-C++17.patch"; + url = "https://gitlab.com/ubports/development/core/telephony-service/-/commit/b77349acb4ab3f857a55481eeaf2af1dcecfb775.patch"; + hash = "sha256-vNtelYu/I9lv8EkNn8gB6zNgLJ24Znp9HYmLG9olFe8="; + }) + ]; + + postPatch = '' + # Queries qmake for the QML installation path, which returns a reference to Qt5's build directory + substituteInPlace CMakeLists.txt \ + --replace "\''${QMAKE_EXECUTABLE} -query QT_INSTALL_QML" "echo $out/${qtbase.qtQmlPrefix}" + + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' + substituteInPlace tests/common/dbus-services/CMakeLists.txt \ + ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.MissionControl5.service"} \ + ${replaceDbusService telepathy-mission-control "org.freedesktop.Telepathy.AccountManager.service"} \ + ${replaceDbusService dconf "ca.desrt.dconf.service"} + + substituteInPlace cmake/modules/GenerateTest.cmake \ + --replace '/usr/lib/dconf' '${lib.getLib dconf}/libexec' \ + --replace '/usr/lib/telepathy' '${lib.getLib telepathy-mission-control}/libexec' + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + + buildInputs = [ + ayatana-indicator-messages + bash + dbus-glib + dbus + dconf + gettext + glib + history-service + libnotify + libphonenumber + libpulseaudio + libusermetrics + lomiri-url-dispatcher + protobuf + (python3.withPackages (ps: with ps; [ + dbus-python + pygobject3 + ])) + qtbase + qtdeclarative + qtfeedback + qtmultimedia + qtpim + telepathy + telepathy-glib + telepathy-mission-control + ]; + + nativeCheckInputs = [ + dbus-test-runner + dconf + gnome.gnome-keyring + telepathy-mission-control + xvfb-run + ]; + + dontWrapQtApps = true; + + cmakeFlags = [ + # These rely on libphonenumber reformatting inputs to certain results + # Seem to be broken for a small amount of numbers, maybe libphonenumber version change? + (lib.cmakeBool "SKIP_QML_TESTS" true) + (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" (lib.concatStringsSep ";" [ + # Exclude tests + "-E" (lib.strings.escapeShellArg "(${lib.concatStringsSep "|" [ + # Flaky, randomly failing to launch properly & stuck until test timeout + "^HandlerTest" + "^OfonoAccountEntryTest" + "^TelepathyHelperSetupTest" + "^AuthHandlerTest" + "^ChatManagerTest" + ]})") + ])) + ]; + + env.NIX_CFLAGS_COMPILE = toString ([ + "-I${lib.getDev telepathy-glib}/include/telepathy-1.0" # it's in telepathy-farstream's Requires.private, so it & its dependencies don't get pulled in + "-I${lib.getDev dbus-glib}/include/dbus-1.0" # telepathy-glib dependency + "-I${lib.getDev dbus}/include/dbus-1.0" # telepathy-glib dependency + ]); + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # Starts & talks to D-Bus services, breaks with parallelism + enableParallelChecking = false; + + preCheck = '' + export QT_QPA_PLATFORM=minimal + export QT_PLUGIN_PATH=${lib.makeSearchPathOutput "bin" qtbase.qtPluginPrefix [ qtbase qtpim ]} + ''; + + postInstall = '' + patchShebangs $out/bin/{ofono-setup,phone-gsettings-migration.py} + + # Still missing getprop from libhybris, we don't have it packaged (yet?) + wrapProgram $out/bin/ofono-setup \ + --prefix PATH : ${lib.makeBinPath [ dbus dconf gettext glib telepathy-mission-control ]} + + # These SystemD services are referenced by the installed D-Bus services, but not part of the installation. Why? + for service in telephony-service-{approver,indicator}; do + install -Dm644 ../debian/telephony-service."$service".user.service $out/lib/systemd/user/"$service".service + + # ofono-setup.service would be rovided by ubuntu-touch-session, we don't plan to package it + substituteInPlace $out/lib/systemd/user/"$service".service \ + --replace '/usr' "$out" \ + --replace 'Requires=ofono-setup.service' "" \ + --replace 'After=ofono-setup.service' "" \ + + sed -i $out/lib/systemd/user/"$service".service \ + -e '/ofono-setup.service/d' + done + ''; + + passthru = { + ayatana-indicators = [ + "telephony-service-indicator" + ]; + tests.vm = nixosTests.ayatana-indicators; + updateScript = gitUpdater { }; + }; + + meta = with lib; { + description = "Backend dispatcher service for various mobile phone related operations"; + homepage = "https://gitlab.com/ubports/development/core/telephony-service"; + changelog = "https://gitlab.com/ubports/development/core/telephony-service/-/blob/${finalAttrs.version}/ChangeLog"; + license = licenses.gpl3Only; + maintainers = teams.lomiri.members; + platforms = platforms.linux; + }; +}) diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 5a3233028ce09..9ecf59d2db6fc 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "code"; rev = version; - sha256 = "sha256-Dtm0+NqDwfn5HUQEYtHTiyrpM3mHp1wUFOGaxH86YUo="; + sha256 = "sha256-6lvn8c+JfbtZQf5dtViosVqtt/RWL6B/MvksXqmCfFs="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 2edb805f7fd49..7ef0fb79ebbe0 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -17,10 +17,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.8.2"; + version = "2.8.3"; rev-prefix = "v"; odd-unstable = false; - sha256 = "sha256-v1YvmdL1AUyzJjbU9/yIYAAuQfbVlJCcdagM5yhKMuU="; + sha256 = "sha256-xRLvjRu/I+wsTWXUhrJUcrQz+JkZCYqoJSqYAYOztgg="; nativeBuildInputs = [ cmake |