qbit/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lomiri.lomiri-content-hub: Rename from lomiri.content-hub, 1.1.1 -> 2.0.0

Browse Source
This commit is contained in:
OPNA2608 2024-09-16 13:04:27 +02:00
parent ed897d230a
commit 6037708c33
12 changed files with 72 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/desktop-managers/lomiri.nix
View File

@ -16,7 +16,6 @@ in {
libayatana-common libayatana-common
ubports-click ubports-click
]) ++ (with pkgs.lomiri; [ ]) ++ (with pkgs.lomiri; [
content-hub
hfd-service hfd-service
history-service history-service
libusermetrics libusermetrics
@ -24,6 +23,7 @@ in {
lomiri-calculator-app lomiri-calculator-app
lomiri-camera-app lomiri-camera-app
lomiri-clock-app lomiri-clock-app
lomiri-content-hub
lomiri-docviewer-app lomiri-docviewer-app
lomiri-download-manager lomiri-download-manager
lomiri-filemanager-app lomiri-filemanager-app
@ -129,7 +129,7 @@ in {
environment.pathsToLink = [ environment.pathsToLink = [
# Configs for inter-app data exchange system # Configs for inter-app data exchange system
"/share/content-hub/peers" "/share/lomiri-content-hub/peers"
# Configs for inter-app URL requests # Configs for inter-app URL requests
"/share/lomiri-url-dispatcher/urls" "/share/lomiri-url-dispatcher/urls"
# Splash screens & other images for desktop apps launched via lomiri-app-launch # Splash screens & other images for desktop apps launched via lomiri-app-launch
@ -194,10 +194,6 @@ in {
}; };
users.groups.usermetrics = { }; users.groups.usermetrics = { };
# TODO content-hub cannot pass files between applications without asking AA for permissions. And alot of the Lomiri stack is designed with AA availability in mind. This might be a requirement to be closer to upstream?
# But content-hub currently fails to pass files between applications even with AA enabled, and we can get away without AA in many places. Let's see how this develops before requiring this for good.
# security.apparmor.enable = true;
}; };
meta.maintainers = lib.teams.lomiri.members; meta.maintainers = lib.teams.lomiri.members;

22
nixos/tests/lomiri.nix
View File

@ -360,13 +360,13 @@ in
}; };
variables = { variables = {
# So we can test what content-hub is working behind the scenes # So we can test what lomiri-content-hub is working behind the scenes
CONTENT_HUB_LOGGING_LEVEL = "2"; LOMIRI_CONTENT_HUB_LOGGING_LEVEL = "2";
}; };
systemPackages = with pkgs; [ systemPackages = with pkgs; [
# For a convenient way of kicking off content-hub peer collection # For a convenient way of kicking off lomiri-content-hub peer collection
lomiri.content-hub.examples lomiri.lomiri-content-hub.examples
]; ];
}; };
@ -484,9 +484,9 @@ in
# lomiri-terminal-app has a separate VM test to test its basic functionality # lomiri-terminal-app has a separate VM test to test its basic functionality
# for the LSS content-hub test to work reliably, we need to kick off peer collecting # for the LSS lomiri-content-hub test to work reliably, we need to kick off peer collecting
machine.send_chars("content-hub-test-importer\n") machine.send_chars("lomiri-content-hub-test-importer\n")
wait_for_text(r"(/build/source|hub.cpp|handler.cpp|void|virtual|const)") # awaiting log messages from content-hub wait_for_text(r"(/build/source|hub.cpp|handler.cpp|void|virtual|const)") # awaiting log messages from lomiri-content-hub
machine.send_key("ctrl-c") machine.send_key("ctrl-c")
# Doing this here, since we need an in-session shell & separately starting a terminal again wastes time # Doing this here, since we need an in-session shell & separately starting a terminal again wastes time
@ -510,7 +510,7 @@ in
wait_for_text("Rotation Lock") wait_for_text("Rotation Lock")
machine.screenshot("settings_open") machine.screenshot("settings_open")
# lomiri-system-settings has a separate VM test, only test Lomiri-specific content-hub functionalities here # lomiri-system-settings has a separate VM test, only test Lomiri-specific lomiri-content-hub functionalities here
# Make fullscreen, can't navigate to Background plugin via keyboard unless window has non-phone-like aspect ratio # Make fullscreen, can't navigate to Background plugin via keyboard unless window has non-phone-like aspect ratio
toggle_maximise() toggle_maximise()
@ -536,7 +536,7 @@ in
# Peers should be loaded # Peers should be loaded
wait_for_text("Morph") # or Gallery, but Morph is already packaged wait_for_text("Morph") # or Gallery, but Morph is already packaged
machine.screenshot("settings_content-hub_peers") machine.screenshot("settings_lomiri-content-hub_peers")
# Select Morph as content source # Select Morph as content source
mouse_click(370, 100) mouse_click(370, 100)
@ -544,11 +544,11 @@ in
# Expect Morph to be brought into the foreground, with its Downloads page open # Expect Morph to be brought into the foreground, with its Downloads page open
wait_for_text("No downloads") wait_for_text("No downloads")
# If content-hub encounters a problem, it may have crashed the original application issuing the request. # If lomiri-content-hub encounters a problem, it may have crashed the original application issuing the request.
# Check that it's still alive # Check that it's still alive
machine.succeed("pgrep -u ${user} -f lomiri-system-settings") machine.succeed("pgrep -u ${user} -f lomiri-system-settings")
machine.screenshot("content-hub_exchange") machine.screenshot("lomiri-content-hub_exchange")
# Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign # Testing any more would require more applications & setup, the fact that it's already being attempted is a good sign
machine.send_key("esc") machine.send_key("esc")

8
pkgs/desktops/lomiri/applications/lomiri-camera-app/default.nix
View File

@ -6,12 +6,12 @@
gitUpdater, gitUpdater,
nixosTests, nixosTests,
cmake, cmake,
content-hub,
exiv2, exiv2,
gettext, gettext,
gst_all_1, gst_all_1,
libusermetrics, libusermetrics,
lomiri-action-api, lomiri-action-api,
lomiri-content-hub,
lomiri-ui-toolkit, lomiri-ui-toolkit,
lomiri-thumbnailer, lomiri-thumbnailer,
pkg-config, pkg-config,
@ -145,9 +145,9 @@ stdenv.mkDerivation (finalAttrs: {
qzxing qzxing
# QML # QML
content-hub
libusermetrics libusermetrics
lomiri-action-api lomiri-action-api
lomiri-content-hub
lomiri-ui-toolkit lomiri-ui-toolkit
lomiri-thumbnailer lomiri-thumbnailer
qtpositioning qtpositioning
@ -192,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
export QML2_IMPORT_PATH=${ export QML2_IMPORT_PATH=${
listToQtVar qtbase.qtQmlPrefix [ listToQtVar qtbase.qtQmlPrefix [
lomiri-ui-toolkit lomiri-ui-toolkit
content-hub lomiri-content-hub
lomiri-thumbnailer lomiri-thumbnailer
] ]
} }
@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: {
ln -s $out/share/lomiri-camera-app/assets/lomiri-camera-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-camera-app.svg ln -s $out/share/lomiri-camera-app/assets/lomiri-camera-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-camera-app.svg
ln -s $out/share/lomiri-camera-app/assets/lomiri-barcode-reader-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-barcode-reader-app.svg ln -s $out/share/lomiri-camera-app/assets/lomiri-barcode-reader-app-splash.svg $out/share/lomiri-app-launch/splash/lomiri-barcode-reader-app.svg
install -Dm644 ../camera-contenthub.json $out/share/content-hub/peers/lomiri-camera-app install -Dm644 ../camera-contenthub.json $out/share/lomiri-content-hub/peers/lomiri-camera-app
''; '';
dontWrapGApps = true; dontWrapGApps = true;

6
pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix
View File

@ -6,10 +6,10 @@
gitUpdater, gitUpdater,
nixosTests, nixosTests,
cmake, cmake,
content-hub,
geonames, geonames,
gettext, gettext,
libusermetrics, libusermetrics,
lomiri-content-hub,
lomiri-sounds, lomiri-sounds,
lomiri-ui-toolkit, lomiri-ui-toolkit,
makeWrapper, makeWrapper,
@ -124,8 +124,8 @@ stdenv.mkDerivation (finalAttrs: {
qtbase qtbase
# QML # QML
content-hub
libusermetrics libusermetrics
lomiri-content-hub
lomiri-ui-toolkit lomiri-ui-toolkit
qtdeclarative qtdeclarative
qtmultimedia qtmultimedia
@ -172,7 +172,7 @@ stdenv.mkDerivation (finalAttrs: {
export QML2_IMPORT_PATH=${ export QML2_IMPORT_PATH=${
listToQtVar qtbase.qtQmlPrefix ( listToQtVar qtbase.qtQmlPrefix (
[ [
content-hub lomiri-content-hub
lomiri-ui-toolkit lomiri-ui-toolkit
qtmultimedia qtmultimedia
u1db-qt u1db-qt

10
pkgs/desktops/lomiri/applications/lomiri-docviewer-app/default.nix
View File

@ -7,9 +7,9 @@
gitUpdater, gitUpdater,
nixosTests, nixosTests,
cmake, cmake,
content-hub,
gettext, gettext,
libreoffice-unwrapped, libreoffice-unwrapped,
lomiri-content-hub,
lomiri-ui-toolkit, lomiri-ui-toolkit,
pkg-config, pkg-config,
poppler, poppler,
@ -84,11 +84,11 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-KdHyKXM0hMMIFkuDn5JZJOEuitWAXT2QQOuR+1AolP0="; hash = "sha256-KdHyKXM0hMMIFkuDn5JZJOEuitWAXT2QQOuR+1AolP0=";
}) })
# Remove when https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/merge_requests/77 merged & in release # Remove when version > 3.0.4
(fetchpatch { (fetchpatch {
name = "1051-lomiri-docviewer-app-Install-content-hub-lomiri-url-dispatcher-files.patch"; name = "1051-lomiri-docviewer-app-Install-content-hub-lomiri-url-dispatcher-files.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/98f5ab9d51ba05e8c3ed1991c0b67d3922b5ba90.patch"; url = "https://gitlab.com/ubports/development/apps/lomiri-docviewer-app/-/commit/d6731f6d00050b42d561d63ae91751761f7fd278.patch";
hash = "sha256-JA26ga1CNOdbis87lSzqbUbs94Oc1vlxraXZxx3dsu8="; hash = "sha256-EFuQ+pMI8fwYM0lgapi/XeAagFbXUzLWzAx0bPkEdzA=";
}) })
]; ];
@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
qtdeclarative qtdeclarative
# QML # QML
content-hub lomiri-content-hub
lomiri-ui-toolkit lomiri-ui-toolkit
qtsystems qtsystems
]; ];

8
pkgs/desktops/lomiri/applications/lomiri-filemanager-app/default.nix
View File

@ -7,8 +7,8 @@
nixosTests, nixosTests,
biometryd, biometryd,
cmake, cmake,
content-hub,
gettext, gettext,
lomiri-content-hub,
lomiri-thumbnailer, lomiri-thumbnailer,
lomiri-ui-extras, lomiri-ui-extras,
lomiri-ui-toolkit, lomiri-ui-toolkit,
@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
# QML # QML
biometryd biometryd
content-hub lomiri-content-hub
lomiri-thumbnailer lomiri-thumbnailer
lomiri-ui-extras lomiri-ui-extras
lomiri-ui-toolkit lomiri-ui-toolkit
@ -119,8 +119,8 @@ stdenv.mkDerivation (finalAttrs: {
postInstall = '' postInstall = ''
# Some misc files don't get installed to the correct paths for us # Some misc files don't get installed to the correct paths for us
mkdir -p $out/share/{content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash} mkdir -p $out/share/{lomiri-content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash}
ln -s $out/share/lomiri-filemanager-app/content-hub.json $out/share/content-hub/peers/lomiri-filemanager-app ln -s $out/share/lomiri-filemanager-app/content-hub.json $out/share/lomiri-content-hub/peers/lomiri-filemanager-app
ln -s $out/share/lomiri-filemanager-app/filemanager.svg $out/share/icons/hicolor/scalable/apps/lomiri-filemanager-app.svg ln -s $out/share/lomiri-filemanager-app/filemanager.svg $out/share/icons/hicolor/scalable/apps/lomiri-filemanager-app.svg
ln -s $out/share/lomiri-filemanager-app/splash.svg $out/share/lomiri-app-launch/splash/lomiri-filemanager-app.svg ln -s $out/share/lomiri-filemanager-app/splash.svg $out/share/lomiri-app-launch/splash/lomiri-filemanager-app.svg
''; '';

19
pkgs/desktops/lomiri/applications/lomiri-gallery-app/default.nix
View File

@ -6,11 +6,11 @@
gitUpdater, gitUpdater,
nixosTests, nixosTests,
cmake, cmake,
content-hub,
exiv2, exiv2,
imagemagick, imagemagick,
libglvnd, libglvnd,
libmediainfo, libmediainfo,
lomiri-content-hub,
lomiri-thumbnailer, lomiri-thumbnailer,
lomiri-ui-extras, lomiri-ui-extras,
lomiri-ui-toolkit, lomiri-ui-toolkit,
@ -88,6 +88,18 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/90a79972741ee0c5dc734dba6c42afeb3ee6a699.patch"; url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/90a79972741ee0c5dc734dba6c42afeb3ee6a699.patch";
hash = "sha256-YAmH0he5/rZYKWFyPzUFAKJuHhUTxB3q8zbLL7Spz/c="; hash = "sha256-YAmH0he5/rZYKWFyPzUFAKJuHhUTxB3q8zbLL7Spz/c=";
}) })
# Remove when version >= 3.1.0
(fetchpatch {
name = "0101-lomiri-gallery-app-Updated-content-hub-peer-name.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/9a3376760ea6825d9915262264f98d7faf94bf81.patch";
hash = "sha256-aKRtKUNDhQNJPW5MkohXw1lTnKvZwz4LnRMqp2pKMpU=";
})
(fetchpatch {
name = "0102-lomiri-gallery-app-lomiri-content-hub-rename.patch";
url = "https://gitlab.com/ubports/development/apps/lomiri-gallery-app/-/commit/cb6eb0ffdf8d67de97572450447df277ce56a226.patch";
hash = "sha256-32QNWmZU1DmXeGkwYUH4g4nPMkYId9k6IdOKm+KfSuE=";
})
]; ];
postPatch = '' postPatch = ''
@ -130,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
qtsvg qtsvg
# QML # QML
content-hub lomiri-content-hub
lomiri-thumbnailer lomiri-thumbnailer
lomiri-ui-extras lomiri-ui-extras
lomiri-ui-toolkit lomiri-ui-toolkit
@ -164,9 +176,6 @@ stdenv.mkDerivation (finalAttrs: {
# Link splash to splash dir # Link splash to splash dir
mkdir -p $out/share/lomiri-app-launch/splash mkdir -p $out/share/lomiri-app-launch/splash
ln -s $out/share/{lomiri-gallery-app/lomiri-gallery-app-splash.svg,lomiri-app-launch/splash/lomiri-gallery-app.svg} ln -s $out/share/{lomiri-gallery-app/lomiri-gallery-app-splash.svg,lomiri-app-launch/splash/lomiri-gallery-app.svg}
# Old name
mv $out/share/content-hub/peers/{,lomiri-}gallery-app
''; '';
passthru = { passthru = {

4
pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
View File

@ -9,7 +9,6 @@
biometryd, biometryd,
cmake, cmake,
cmake-extras, cmake-extras,
content-hub,
dbus, dbus,
deviceinfo, deviceinfo,
geonames, geonames,
@ -24,6 +23,7 @@
libqofono, libqofono,
libqtdbustest, libqtdbustest,
libqtdbusmock, libqtdbusmock,
lomiri-content-hub,
lomiri-indicator-network, lomiri-indicator-network,
lomiri-schemas, lomiri-schemas,
lomiri-settings-components, lomiri-settings-components,
@ -122,8 +122,8 @@ stdenv.mkDerivation (finalAttrs: {
propagatedBuildInputs = [ propagatedBuildInputs = [
ayatana-indicator-datetime ayatana-indicator-datetime
biometryd biometryd
content-hub
libqofono libqofono
lomiri-content-hub
lomiri-indicator-network lomiri-indicator-network
lomiri-schemas lomiri-schemas
lomiri-settings-components lomiri-settings-components

11
pkgs/desktops/lomiri/applications/morph-browser/default.nix
View File

@ -5,10 +5,10 @@
, gitUpdater , gitUpdater
, nixosTests , nixosTests
, cmake , cmake
, content-hub
, gettext , gettext
, libapparmor , libapparmor
, lomiri-action-api , lomiri-action-api
, lomiri-content-hub
, lomiri-ui-extras , lomiri-ui-extras
, lomiri-ui-toolkit , lomiri-ui-toolkit
, pkg-config , pkg-config
@ -50,6 +50,13 @@ stdenv.mkDerivation (finalAttrs: {
url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/0527a1e01fb27c62f5e0011274f73bad400e9691.patch"; url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/0527a1e01fb27c62f5e0011274f73bad400e9691.patch";
hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no="; hash = "sha256-zx/pP72uNqAi8TZR4bKeONuqcJyK/vGtPglTA+5R5no=";
}) })
# Remove when https://gitlab.com/ubports/development/core/morph-browser/-/merge_requests/580 merged & in release
(fetchpatch {
name = "0003-morph-browser-lomiri-content-hub-rename.patch";
url = "https://gitlab.com/ubports/development/core/morph-browser/-/commit/29e5031a1fd0aa69587724b25772ae78d6d2bd7d.patch";
hash = "sha256-nxOaiRSKi+Nb0JLopi0UNvpnctjkPkjhaHLAWPHRfQA=";
})
]; ];
postPatch = '' postPatch = ''
@ -84,8 +91,8 @@ stdenv.mkDerivation (finalAttrs: {
qtwebengine qtwebengine
# QML # QML
content-hub
lomiri-action-api lomiri-action-api
lomiri-content-hub
lomiri-ui-extras lomiri-ui-extras
lomiri-ui-toolkit lomiri-ui-toolkit
qqc2-suru-style qqc2-suru-style

8
pkgs/desktops/lomiri/applications/teleports/default.nix
View File

@ -7,8 +7,8 @@
gitUpdater, gitUpdater,
nixosTests, nixosTests,
cmake, cmake,
content-hub,
intltool, intltool,
lomiri-content-hub,
lomiri-indicator-network, lomiri-indicator-network,
lomiri-push-qml, lomiri-push-qml,
lomiri-thumbnailer, lomiri-thumbnailer,
@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
buildInputs = [ buildInputs = [
content-hub lomiri-content-hub
lomiri-indicator-network lomiri-indicator-network
lomiri-push-qml lomiri-push-qml
lomiri-thumbnailer lomiri-thumbnailer
@ -102,10 +102,10 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
postInstall = '' postInstall = ''
mkdir -p $out/share/{applications,content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash,lomiri-url-dispatcher/urls} mkdir -p $out/share/{applications,lomiri-content-hub/peers,icons/hicolor/scalable/apps,lomiri-app-launch/splash,lomiri-url-dispatcher/urls}
ln -s $out/share/teleports/teleports.desktop $out/share/applications/teleports.desktop ln -s $out/share/teleports/teleports.desktop $out/share/applications/teleports.desktop
ln -s $out/share/teleports/teleports.content-hub $out/share/content-hub/peers/teleports ln -s $out/share/teleports/teleports.content-hub $out/share/lomiri-content-hub/peers/teleports
ln -s $out/share/teleports/assets/icon.svg $out/share/icons/hicolor/scalable/apps/teleports.svg ln -s $out/share/teleports/assets/icon.svg $out/share/icons/hicolor/scalable/apps/teleports.svg
ln -s $out/share/teleports/assets/splash.svg $out/share/lomiri-app-launch/splash/teleports.svg ln -s $out/share/teleports/assets/splash.svg $out/share/lomiri-app-launch/splash/teleports.svg
ln -s $out/share/teleports/teleports.url-dispatcher $out/share/lomiri-url-dispatcher/urls/teleports.url-dispatcher ln -s $out/share/teleports/teleports.url-dispatcher $out/share/lomiri-url-dispatcher/urls/teleports.url-dispatcher

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

@ -56,7 +56,7 @@ let
#### Services #### Services
biometryd = callPackage ./services/biometryd { }; biometryd = callPackage ./services/biometryd { };
content-hub = callPackage ./services/content-hub { }; lomiri-content-hub = callPackage ./services/lomiri-content-hub { };
hfd-service = callPackage ./services/hfd-service { }; hfd-service = callPackage ./services/hfd-service { };
history-service = callPackage ./services/history-service { }; history-service = callPackage ./services/history-service { };
lomiri-download-manager = callPackage ./services/lomiri-download-manager { }; lomiri-download-manager = callPackage ./services/lomiri-download-manager { };
@ -70,5 +70,6 @@ let
in in
lib.makeScope libsForQt5.newScope packages lib.makeScope libsForQt5.newScope packages
// lib.optionalAttrs config.allowAliases { // 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
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 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
} }

64
pkgs/desktops/lomiri/services/content-hub/default.nix → pkgs/desktops/lomiri/services/lomiri-content-hub/default.nix
View File

@ -1,8 +1,6 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitLab , fetchFromGitLab
, fetchpatch
, fetchpatch2
, gitUpdater , gitUpdater
, testers , testers
, cmake , cmake
@ -30,14 +28,14 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "content-hub"; pname = "lomiri-content-hub";
version = "1.1.1"; version = "2.0.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "ubports"; owner = "ubports";
repo = "development/core/content-hub"; repo = "development/core/lomiri-content-hub";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-sQeyJV+Wc6PHKGIefl/dfU06XqTdICsn+Xamjx3puiI="; hash = "sha256-eA5oCoAZB7fWyWm0Sy6wXh0EW+h76bdfJ2dotr7gUC0=";
}; };
outputs = [ outputs = [
@ -46,44 +44,6 @@ stdenv.mkDerivation (finalAttrs: {
"examples" "examples"
]; ];
patches = [
# Remove when version > 1.1.1
(fetchpatch {
name = "0001-content-hub-Migrate-to-GetConnectionCredentials.patch";
url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/9ec9df32f77383eec7994d8e3e6961531bc8464d.patch";
hash = "sha256-14dZosMTMa1FDGEMuil0r1Hz6vn+L9XC83NMAqC7Ol8=";
})
# 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 version > 1.1.1
# 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=";
})
# Remove when version > 1.1.1
(fetchpatch {
name = "0004-content-hub-Fix-generation-of-transfer_files-and-moc_test_harness.patch";
url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/68899c75e77e1f34176b8a550d52794413e5070f.patch";
hash = "sha256-HAxePnzY/cL2c+o+Aw2N1pdr8rsbHGmRsH2EQkrBcHg=";
})
# Remove when https://gitlab.com/ubports/development/core/lomiri-content-hub/-/merge_requests/40 merged & in release
(fetchpatch {
name = "0006-content-hub-Fix-AppArmor-less-transfer.patch";
url = "https://gitlab.com/ubports/development/core/content-hub/-/commit/b58e5c8babf00ad7c402555c96254ce0165adb9e.patch";
hash = "sha256-a7x/0NiUBmmFlq96jkHyLCL0f5NIFh5JR/H+FQ/2GqI=";
})
];
postPatch = '' postPatch = ''
substituteInPlace import/*/Content/CMakeLists.txt \ substituteInPlace import/*/Content/CMakeLists.txt \
--replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}" --replace-fail "\''${CMAKE_INSTALL_LIBDIR}/qt5/qml" "\''${CMAKE_INSTALL_PREFIX}/${qtbase.qtQmlPrefix}"
@ -163,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
moveToOutput share/applications/$exampleExe.desktop $examples moveToOutput share/applications/$exampleExe.desktop $examples
done done
moveToOutput share/icons $examples moveToOutput share/icons $examples
moveToOutput share/content-hub/peers $examples moveToOutput share/lomiri-content-hub/peers $examples
''; '';
postFixup = '' postFixup = ''
@ -178,20 +138,20 @@ stdenv.mkDerivation (finalAttrs: {
}; };
meta = { meta = {
description = "Content sharing/picking service"; description = "Content sharing/picking service for the Lomiri desktop";
longDescription = '' longDescription = ''
content-hub is a mediation service to let applications share content between them, lomiri-content-hub is a mediation service to let applications share content between them,
even if they are not running at the same time. even if they are not running at the same time.
''; '';
homepage = "https://gitlab.com/ubports/development/core/content-hub"; homepage = "https://gitlab.com/ubports/development/core/lomiri-content-hub";
changelog = "https://gitlab.com/ubports/development/core/content-hub/-/blob/${finalAttrs.version}/ChangeLog"; changelog = "https://gitlab.com/ubports/development/core/lomiri-content-hub/-/blob/${finalAttrs.version}/ChangeLog";
license = with lib.licenses; [ gpl3Only lgpl3Only ]; license = with lib.licenses; [ gpl3Only lgpl3Only ];
mainProgram = "content-hub-service"; mainProgram = "lomiri-content-hub-service";
maintainers = lib.teams.lomiri.members; maintainers = lib.teams.lomiri.members;
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
pkgConfigModules = [ pkgConfigModules = [
"libcontent-hub" "liblomiri-content-hub"
"libcontent-hub-glib" "liblomiri-content-hub-glib"
]; ];
}; };
}) })