commit b7d58b870d7773d1193da6682f2300e9e0710aa3 · pyrox.dev/nixpkgs

+2 -2

nixos/modules/services/desktop-managers/lomiri.nix

···

       100
       100
        
                   lomiri-session # wrappers to properly launch the session

     

       101
       101
        
                   lomiri-sounds

     

       102
       102
        
                   lomiri-system-settings

     

       103
       103
       +
                   lomiri-telephony-service

     

       103
       104
        
                   lomiri-terminal-app

     

       104
       105
        
                   lomiri-thumbnailer

     

       105
       106
        
                   lomiri-url-dispatcher

     

       106
       107
        
                   mediascanner2 # TODO possibly needs to be kicked off by graphical-session.target

     

       107
       108
        
                   morph-browser

     

       108
       109
        
                   qtmir # not having its desktop file for Xwayland available causes any X11 application to crash the session

     

       109
       109
       -
                   telephony-service

     

       110
       110
        
                   teleports

     

       111
       111
        
                 ]);

     

       112
       112
        
             };

     
···

       152
       152
        
                 )

     

       153
       153
        
                 ++ (

     

       154
       154
        
                   with pkgs.lomiri;

     

       155
       155
       -
                   [ telephony-service ]

     

       155
       155
       +
                   [ lomiri-telephony-service ]

     

       156
       156
        
                   ++ lib.optionals config.networking.networkmanager.enable [ lomiri-indicator-network ]

     

       157
       157
        
                 );

     

       158
       158
        
             };

+1 -1

nixos/tests/ayatana-indicators.nix

···

       43
       43
        
                 ]

     

       44
       44
        
                 ++ (with pkgs.lomiri; [

     

       45
       45
        
                   lomiri-indicator-network

     

       46
       46
       -
                   telephony-service

     

       46
       46
       +
                   lomiri-telephony-service

     

       47
       47
        
                 ]);

     

       48
       48
        
             };

     

       49
       49

+4 -4

pkgs/desktops/lomiri/applications/lomiri/default.nix

···

       35
       35
        
         lomiri-app-launch,

     

       36
       36
        
         lomiri-download-manager,

     

       37
       37
        
         lomiri-indicator-network,

     

       38
       38
       -
         lomiri-ui-toolkit,

     

       38
       38
       +
         lomiri-notifications,

     

       39
       39
        
         lomiri-settings-components,

     

       40
       40
        
         lomiri-system-settings-unwrapped,

     

       41
       41
        
         lomiri-schemas,

     

       42
       42
       -
         lomiri-notifications,

     

       42
       42
       +
         lomiri-telephony-service,

     

       43
       43
        
         lomiri-thumbnailer,

     

       44
       44
       +
         lomiri-ui-toolkit,

     

       44
       45
        
         maliit-keyboard,

     

       45
       46
        
         mir_2_15,

     

       46
       47
        
         nixos-icons,

     
···

       55
       56
        
         qtmir,

     

       56
       57
        
         qtmultimedia,

     

       57
       58
        
         qtsvg,

     

       58
       58
       -
         telephony-service,

     

       59
       59
        
         wrapGAppsHook3,

     

       60
       60
        
         wrapQtAppsHook,

     

       61
       61
        
         xwayland,

     
···

       210
       210
        
           hfd-service

     

       211
       211
        
           lomiri-notifications

     

       212
       212
        
           lomiri-settings-components

     

       213
       213
       +
           lomiri-telephony-service

     

       213
       214
        
           lomiri-thumbnailer

     

       214
       215
        
           qtmultimedia

     

       215
       215
       -
           telephony-service

     

       216
       216
        
         ];

     

       217
       217
        
       

     

       218
       218
        
         nativeCheckInputs = [ (python3.withPackages (ps: with ps; [ python-dbusmock ])) ];

+2 -1

pkgs/desktops/lomiri/default.nix

···

       63
       63
        
             lomiri-history-service = callPackage ./services/lomiri-history-service { };

     

       64
       64
        
             lomiri-indicator-network = callPackage ./services/lomiri-indicator-network { };

     

       65
       65
        
             lomiri-polkit-agent = callPackage ./services/lomiri-polkit-agent { };

     

       66
       66
       +
             lomiri-telephony-service = callPackage ./services/lomiri-telephony-service { };

     

       66
       67
        
             lomiri-thumbnailer = callPackage ./services/lomiri-thumbnailer { };

     

       67
       68
        
             lomiri-url-dispatcher = callPackage ./services/lomiri-url-dispatcher { };

     

       68
       69
        
             mediascanner2 = callPackage ./services/mediascanner2 { };

     

       69
       69
       -
             telephony-service = callPackage ./services/telephony-service { };

     

       70
       70
        
           };

     

       71
       71
        
       in

     

       72
       72
        
       lib.makeScope libsForQt5.newScope packages

     
···

       74
       74
        
         content-hub = lib.warnOnInstantiate "`content-hub` was renamed to `lomiri-content-hub`." pkgs.lomiri.lomiri-content-hub; # Added on 2024-09-11

     

       75
       75
        
         history-service = lib.warnOnInstantiate "`history-service` was renamed to `lomiri-history-service`." pkgs.lomiri.lomiri-history-service; # Added on 2024-11-11

     

       76
       76
        
         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

     

       77
       77
       +
         telephony-service = lib.warnOnInstantiate "`telephony-service` was renamed to `lomiri-telephony-service`." pkgs.lomiri.lomiri-telephony-service; # Adder on 2025-01-15

     

       77
       78
        
       }

+12 -53

pkgs/desktops/lomiri/services/telephony-service/default.nix pkgs/desktops/lomiri/services/lomiri-telephony-service/default.nix

···

       2
       2
        
         stdenv,

     

       3
       3
        
         lib,

     

       4
       4
        
         fetchFromGitLab,

     

       5
       5
       -
         fetchpatch,

     

       6
       5
        
         gitUpdater,

     

       7
       6
        
         nixosTests,

     

       8
       7
        
         runCommand,

     
···

       43
       42
        
           "--replace-fail \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\"";

     

       44
       43
        
       in

     

       45
       44
        
       stdenv.mkDerivation (finalAttrs: {

     

       46
       46
       -
         pname = "telephony-service";

     

       47
       47
       -
         version = "0.5.3";

     

       45
       45
       +
         pname = "lomiri-telephony-service";

     

       46
       46
       +
         version = "0.6.0";

     

       48
       47
        
       

     

       49
       48
        
         src = fetchFromGitLab {

     

       50
       49
        
           owner = "ubports";

     

       51
       51
       -
           repo = "development/core/telephony-service";

     

       52
       52
       -
           rev = finalAttrs.version;

     

       53
       53
       -
           hash = "sha256-eLGwAJmBDDvSODQUNr/zcPA/0DdXtVBiS7vg+iIYPDo=";

     

       50
       50
       +
           repo = "development/core/lomiri-telephony-service";

     

       51
       51
       +
           tag = finalAttrs.version;

     

       52
       52
       +
           hash = "sha256-vEMTnflHszgANSZHcVGx1goMWVe7/6eZLYCIxq8aMt4=";

     

       54
       53
        
         };

     

       55
       55
       -
       

     

       56
       56
       -
         patches = [

     

       57
       57
       -
           # Remove when https://gitlab.com/ubports/development/core/telephony-service/-/merge_requests/90 merged & in release

     

       58
       58
       -
           (fetchpatch {

     

       59
       59
       -
             name = "0001-lomiri-telephony-service-CMakeLists-Make-tests-optional.patch";

     

       60
       60
       -
             url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9a8297bcf9b34d77ffdae3dfe4ad2636022976fb.patch";

     

       61
       61
       -
             hash = "sha256-Za4ZGKnw9iz2RP1LzLhKrEJ1vLUufWk8J07LmWDW40E=";

     

       62
       62
       -
           })

     

       63
       63
       -
       

     

       64
       64
       -
           # Remove when version > 0.5.3

     

       65
       65
       -
           (fetchpatch {

     

       66
       66
       -
             name = "0002-lomiri-telephony-service-Fix-gettext-funcs-in-wrong-namespace.patch";

     

       67
       67
       -
             url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/18e0ba8e025b097eef1217d97d98ef4a4940fe84.patch";

     

       68
       68
       -
             hash = "sha256-vOIy+B/OQeccsVn4pXsnr8LYyEapqbebW1I6dBg5u2c=";

     

       69
       69
       -
           })

     

       70
       70
       -
       

     

       71
       71
       -
           # Remove when version > 0.5.3

     

       72
       72
       -
           (fetchpatch {

     

       73
       73
       -
             name = "0003-lomiri-telephony-service-Handle-renamed-history-service.patch";

     

       74
       74
       -
             url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/3a387670ed13041db069068292b1f41229e79583.patch";

     

       75
       75
       -
             hash = "sha256-b7gxzr6Mmtogclq3hR7a/zl+816H2wmJqv3oHjUJggw=";

     

       76
       76
       -
           })

     

       77
       77
       -
       

     

       78
       78
       -
           # Remove when version > 0.5.3

     

       79
       79
       -
           # Patched to be compatible with pre-rename code

     

       80
       80
       -
           (runCommand "0004-lomiri-telephony-service-Fix-NotificationInterface-regeneration-backported.patch"

     

       81
       81
       -
             {

     

       82
       82
       -
               src = fetchpatch {

     

       83
       83
       -
                 name = "0004-lomiri-telephony-service-Fix-NotificationInterface-regeneration.patch";

     

       84
       84
       -
                 url = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/commit/9533ce1a9495e5c11e9b78fc0166e903e19519b4.patch";

     

       85
       85
       -
                 hash = "sha256-3rsZ08bz2CxKpcwYWCCd6f7gJ22v9jl7Lg7JPnWz50A=";

     

       86
       86
       -
               };

     

       87
       87
       -
             }

     

       88
       88
       -
             ''

     

       89
       89
       -
               cp $src $out

     

       90
       90
       -
               substituteInPlace $out \

     

       91
       91
       -
                 --replace-fail 'lomiritelephony' 'telephony'

     

       92
       92
       -
             ''

     

       93
       93
       -
           )

     

       94
       94
       -
         ];

     

       95
       54
        
       

     

       96
       55
        
         postPatch =

     

       97
       56
        
           ''

     
···

       226
       185
        
             }

     

       227
       186
        
       

     

       228
       187
        
           # These SystemD services are referenced by the installed D-Bus services, but not part of the installation. Why?

     

       229
       229
       -
           for service in telephony-service-{approver,indicator}; do

     

       230
       230
       -
             install -Dm644 ../debian/telephony-service."$service".user.service $out/lib/systemd/user/"$service".service

     

       188
       188
       +
           for service in lomiri-telephony-service-approver lomiri-indicator-telephony-service; do

     

       189
       189
       +
             install -Dm644 ../debian/lomiri-telephony-service."$service".user.service $out/lib/systemd/user/"$service".service

     

       231
       190
        
       

     

       232
       191
        
             # ofono-setup.service would be provided by ubuntu-touch-session, we don't plan to package it

     

       233
       192
        
             # Doesn't make sense to provide on non-Lomiri

     
···

       235
       194
        
               --replace-fail '/usr' "$out" \

     

       236
       195
        
               --replace-warn 'Requires=ofono-setup.service' "" \

     

       237
       196
        
               --replace-warn 'After=ofono-setup.service' "" \

     

       238
       238
       -
               --replace-warn 'WantedBy=ayatana-indicators.target' 'WantedBy=lomiri-indicators.target'

     

       197
       197
       +
               --replace-warn 'ayatana-indicators.target' 'lomiri-indicators.target'

     

       239
       198
        
           done

     

       240
       199
        
       

     

       241
       200
        
           # Parses the call & SMS indicator desktop files & tries to find its own executable in PATH

     

       242
       242
       -
           wrapProgram $out/bin/telephony-service-indicator \

     

       201
       201
       +
           wrapProgram $out/bin/lomiri-indicator-telephony-service \

     

       243
       202
        
             --prefix PATH : "$out/bin"

     

       244
       203
        
         '';

     

       245
       204
        
       

     

       246
       205
        
         passthru = {

     

       247
       206
        
           ayatana-indicators = {

     

       248
       248
       -
             telephony-service-indicator = [ "lomiri" ];

     

       207
       207
       +
             lomiri-indicator-telephony-service = [ "lomiri" ];

     

       249
       208
        
           };

     

       250
       209
        
           tests.vm = nixosTests.ayatana-indicators;

     

       251
       210
        
           updateScript = gitUpdater { };

     
···

       253
       212
        
       

     

       254
       213
        
         meta = {

     

       255
       214
        
           description = "Backend dispatcher service for various mobile phone related operations";

     

       256
       256
       -
           homepage = "https://gitlab.com/ubports/development/core/telephony-service";

     

       257
       257
       -
           changelog = "https://gitlab.com/ubports/development/core/telephony-service/-/blob/${finalAttrs.version}/ChangeLog";

     

       215
       215
       +
           homepage = "https://gitlab.com/ubports/development/core/lomiri-telephony-service";

     

       216
       216
       +
           changelog = "https://gitlab.com/ubports/development/core/lomiri-telephony-service/-/blob/${finalAttrs.version}/ChangeLog";

     

       258
       217
        
           license = lib.licenses.gpl3Only;

     

       259
       218
        
           maintainers = lib.teams.lomiri.members;

     

       260
       219
        
           platforms = lib.platforms.linux;