NixOS/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 17:46:29 +09:00
Code Activity

lomiri.lomiri-telephony-service: 0.5.3 -> 0.6.0, rename from lomiri.telephony-service

Browse source
This commit is contained in:
OPNA2608 2025-01-15 22:45:08 +01:00
parent f4120b8ab4
commit 057d0c76dc
5 changed files with 21 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/desktop-managers/lomiri.nix
View file

@ -100,13 +100,13 @@ in
lomiri-session # wrappers to properly launch the session
lomiri-sounds
lomiri-system-settings
lomiri-telephony-service
lomiri-terminal-app
lomiri-thumbnailer
lomiri-url-dispatcher
mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target
morph-browser
qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session
telephony-service
teleports
]);
};
@ -152,7 +152,7 @@ in
)
++ (
with pkgs.lomiri;
[ telephony-service ]
[ lomiri-telephony-service ]
++ lib.optionals config.networking.networkmanager.enable [ lomiri-indicator-network ]
);
};

2
nixos/tests/ayatana-indicators.nix
View file

@ -43,7 +43,7 @@ in
]
++ (with pkgs.lomiri; [
lomiri-indicator-network
telephony-service
lomiri-telephony-service
]);
};

8
pkgs/desktops/lomiri/applications/lomiri/default.nix
View file

@ -35,12 +35,13 @@
lomiri-app-launch,
lomiri-download-manager,
lomiri-indicator-network,
lomiri-ui-toolkit,
lomiri-notifications,
lomiri-settings-components,
lomiri-system-settings-unwrapped,
lomiri-schemas,
lomiri-notifications,
lomiri-telephony-service,
lomiri-thumbnailer,
lomiri-ui-toolkit,
maliit-keyboard,
mir_2_15,
nixos-icons,
@ -55,7 +56,6 @@
qtmir,
qtmultimedia,
qtsvg,
telephony-service,
wrapGAppsHook3,
wrapQtAppsHook,
xwayland,
@ -211,9 +211,9 @@ stdenv.mkDerivation (finalAttrs: {
hfd-service
lomiri-notifications
lomiri-settings-components
lomiri-telephony-service
lomiri-thumbnailer
qtmultimedia
telephony-service
];
nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ python-dbusmock ])) ];

3
pkgs/desktops/lomiri/default.nix
View file

@ -63,10 +63,10 @@ let
lomiri-history-service = callPackage ./services/lomiri-history-service { };
lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { };
lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { };
lomiri-telephony-service = callPackage ./services/lomiri-telephony-service { };
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
@ -74,4 +74,5 @@ lib.makeScope libsForQt5.newScope packages
content-hub = lib.warnOnInstantiate "`content-hub` was renamed to `lomiri-content-hub`." pkgs.lomiri.lomiri-content-hub; # Added on 2024-09-11
history-service = lib.warnOnInstantiate "`history-service` was renamed to `lomiri-history-service`." pkgs.lomiri.lomiri-history-service; # Added on 2024-11-11
lomiri-system-settings-security-privacy = lib.warnOnInstantiate "`lomiri-system-settings-security-privacy` upstream was merged into `lomiri-system-settings`. Please use `pkgs.lomiri.lomiri-system-settings-unwrapped` if you need to directly access the plugins that belonged to this project." pkgs.lomiri.lomiri-system-settings-unwrapped; # Added on 2024-08-08
telephony-service = lib.warnOnInstantiate "`telephony-service` was renamed to `lomiri-telephony-service`." pkgs.lomiri.lomiri-telephony-service; # Adder on 2025-01-15
}

65
pkgs/desktops/lomiri/services/telephony-service/default.nix → pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix
View file

@ -2,7 +2,6 @@
stdenv,
lib,
fetchFromGitLab,
fetchpatch,
gitUpdater,
nixosTests,
runCommand,
@ -43,56 +42,16 @@ let
"--replace-fail \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\"";
in
stdenv.mkDerivation (finalAttrs: {
pname = "telephony-service";
version = "0.5.3";
pname = "lomiri-telephony-service";
version = "0.6.0";
src = fetchFromGitLab {
owner = "ubports";
repo = "development/core/telephony-service";
rev = finalAttrs.version;
hash = "sha256-eLGwAJmBDDvSODQUNr/zcPA/0DdXtVBiS7vg+iIYPDo=";
repo = "development/core/lomiri-telephony-service";
tag = finalAttrs.version;
hash = "sha256-vEMTnflHszgANSZHcVGx1goMWVe7/6eZLYCIxq8aMt4=";
};
patches = [
# Remove when https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/90 merged & in release
(fetchpatch {
name = "0001-lomiri-telephony-service-CMakeLists-Make-tests-optional.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch";
hash = "sha256-Za4ZGKnw9iz2RP1LzLhKrEJ1vLUufWk8J07LmWDW40E=";
})
# Remove when version > 0.5.3
(fetchpatch {
name = "0002-lomiri-telephony-service-Fix-gettext-funcs-in-wrong-namespace.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/18e0ba8e025b097eef1217d97d98ef4a4940fe84.patch";
hash = "sha256-vOIy+B/OQeccsVn4pXsnr8LYyEapqbebW1I6dBg5u2c=";
})
# Remove when version > 0.5.3
(fetchpatch {
name = "0003-lomiri-telephony-service-Handle-renamed-history-service.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/3a387670ed13041db069068292b1f41229e79583.patch";
hash = "sha256-b7gxzr6Mmtogclq3hR7a/zl+816H2wmJqv3oHjUJggw=";
})
# Remove when version > 0.5.3
# Patched to be compatible with pre-rename code
(runCommand "0004-lomiri-telephony-service-Fix-NotificationInterface-regeneration-backported.patch"
{
src = fetchpatch {
name = "0004-lomiri-telephony-service-Fix-NotificationInterface-regeneration.patch";
url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9533ce1a9495e5c11e9b78fc0166e903e19519b4.patch";
hash = "sha256-3rsZ08bz2CxKpcwYWCCd6f7gJ22v9jl7Lg7JPnWz50A=";
};
}
''
cp $src $out
substituteInPlace $out \
--replace-fail 'lomiritelephony' 'telephony'
''
)
];
postPatch =
''
# Queries qmake for the QML installation path, which returns a reference to Qt5's build directory
@ -226,8 +185,8 @@ stdenv.mkDerivation (finalAttrs: {
}
# 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
for service in lomiri-telephony-service-approver lomiri-indicator-telephony-service; do
install -Dm644 ../debian/lomiri-telephony-service."$service".user.service $out/lib/systemd/user/"$service".service
# ofono-setup.service would be provided by ubuntu-touch-session, we don't plan to package it
# Doesn't make sense to provide on non-Lomiri
@ -235,17 +194,17 @@ stdenv.mkDerivation (finalAttrs: {
--replace-fail '/usr' "$out" \
--replace-warn 'Requires=ofono-setup.service' "" \
--replace-warn 'After=ofono-setup.service' "" \
--replace-warn 'WantedBy=ayatana-indicators.target' 'WantedBy=lomiri-indicators.target'
--replace-warn 'ayatana-indicators.target' 'lomiri-indicators.target'
done
# Parses the call & SMS indicator desktop files & tries to find its own executable in PATH
wrapProgram $out/bin/telephony-service-indicator \
wrapProgram $out/bin/lomiri-indicator-telephony-service \
--prefix PATH : "$out/bin"
'';
passthru = {
ayatana-indicators = {
telephony-service-indicator = [ "lomiri" ];
lomiri-indicator-telephony-service = [ "lomiri" ];
};
tests.vm = nixosTests.ayatana-indicators;
updateScript = gitUpdater { };
@ -253,8 +212,8 @@ stdenv.mkDerivation (finalAttrs: {
meta = {
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";
homepage = "https://gitlab.com/ubports/development/core/lomiri-telephony-service";
changelog = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/blob/${finalAttrs.version}/ChangeLog";
license = lib.licenses.gpl3Only;
maintainers = lib.teams.lomiri.members;
platforms = lib.platforms.linux;