lomiri.lomiri-history-service: Rename from lomiri.history-service

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

@@ -79,7 +79,6 @@ in
           ])
           ++ (with pkgs.lomiri; [
             hfd-service
-            history-service
             libusermetrics
             lomiri
             lomiri-calculator-app
@@ -90,6 +89,7 @@ in
             lomiri-download-manager
             lomiri-filemanager-app
             lomiri-gallery-app
+            lomiri-history-service
             lomiri-polkit-agent
             lomiri-schemas # exposes some required dbus interfaces
             lomiri-session # wrappers to properly launch the session

pkgs/desktops/lomiri/default.nix

@@ -58,8 +58,8 @@ let
       biometryd = callPackage ./services/biometryd { };
       lomiri-content-hub = callPackage ./services/lomiri-content-hub { };
       hfd-service = callPackage ./services/hfd-service { };
-      history-service = callPackage ./services/history-service { };
       lomiri-download-manager = callPackage ./services/lomiri-download-manager { };
+      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-thumbnailer = callPackage ./services/lomiri-thumbnailer { };
@@ -71,5 +71,6 @@ in
 lib.makeScope libsForQt5.newScope packages
 // lib.optionalAttrs config.allowAliases {
   content-hub = lib.warn "`content-hub` was renamed to `lomiri-content-hub`." pkgs.lomiri.lomiri-content-hub; # Added on 2024-09-11
+  history-service = lib.warn "`history-service` was renamed to `lomiri-history-service`." pkgs.lomiri.lomiri-history-service; # Added on 2024-11-11
   lomiri-system-settings-security-privacy = lib.warn "`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
 }

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

@@ -30,7 +30,7 @@ let
     "--replace-fail \"\\\${DBUS_SERVICES_DIR}/${name}\" \"${pkg}/share/dbus-1/services/${name}\"";
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "history-service";
+  pname = "lomiri-history-service";
   version = "0.6";
 
   src = fetchFromGitLab {
@@ -159,8 +159,8 @@ stdenv.mkDerivation (finalAttrs: {
 
       Database location: ~/.local/share/history-service/history.sqlite
     '';
-    homepage = "https://gitlab.com/ubports/development/core/history-service";
+    homepage = "https://gitlab.com/ubports/development/core/lomiri-history-service";
-    changelog = "https://gitlab.com/ubports/development/core/history-service/-/blob/${finalAttrs.version}/ChangeLog";
+    changelog = "https://gitlab.com/ubports/development/core/lomiri-history-service/-/blob/${finalAttrs.version}/ChangeLog";
     license = lib.licenses.gpl3Only;
     maintainers = lib.teams.lomiri.members;
     platforms = lib.platforms.linux;

pkgs/desktops/lomiri/services/lomiri-history-service/update_schema.sh.in

@@ -25,7 +25,7 @@ done
 # To output the schema
 echo ".fullschema" >> $MERGED_COMMANDS
 
-# The schemas may use functions that history-service defines in C which don't affect the generated schema in a meaningful way.
+# The schemas may use functions that lomiri-history-service defines in C which don't affect the generated schema in a meaningful way.
 # sqlite will return an error after processing queries with such function calls, so remove them.
 sed -i -e '/normalizeId(/d' $MERGED_COMMANDS
 

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

@@ -15,11 +15,11 @@
   gettext,
   glib,
   gnome-keyring,
-  history-service,
   libnotify,
   libphonenumber,
   libpulseaudio,
   libusermetrics,
+  lomiri-history-service,
   lomiri-url-dispatcher,
   makeWrapper,
   pkg-config,
@@ -111,11 +111,11 @@ stdenv.mkDerivation (finalAttrs: {
     dconf
     gettext
     glib
-    history-service
     libnotify
     libphonenumber
     libpulseaudio
     libusermetrics
+    lomiri-history-service
     lomiri-url-dispatcher
     protobuf
     (python3.withPackages (