From c0a9799ad117ed7f656741533b24bcf70a01844f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 5 Sep 2024 20:26:23 +0800 Subject: [PATCH] tinysparql: Renamed from tracker The project renamed in 3.8. This commit is done by hand. --- doc/languages-frameworks/rust.section.md | 4 ++-- nixos/modules/services/desktops/gnome/tinysparql.nix | 6 +++--- pkgs/applications/graphics/gnome-photos/default.nix | 4 ++-- pkgs/applications/misc/gnome-usage/default.nix | 4 ++-- pkgs/applications/misc/health/default.nix | 4 ++-- pkgs/by-name/gn/gnome-applets/package.nix | 4 ++-- pkgs/by-name/gn/gnome-control-center/package.nix | 4 ++-- pkgs/by-name/gn/gnome-music/package.nix | 4 ++-- pkgs/by-name/gn/gnome-notes/package.nix | 4 ++-- pkgs/by-name/lo/localsearch/package.nix | 4 ++-- pkgs/by-name/na/nautilus/package.nix | 4 ++-- pkgs/by-name/po/polari/package.nix | 4 ++-- pkgs/by-name/ry/rygel/package.nix | 4 ++-- .../default.nix => by-name/ti/tinysparql/package.nix} | 5 +---- pkgs/by-name/we/web-archives/package.nix | 4 ++-- pkgs/development/libraries/grilo-plugins/default.nix | 4 ++-- pkgs/development/libraries/gtk/3.x.nix | 4 ++-- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- pkgs/development/libraries/sqlite/default.nix | 4 ++-- pkgs/servers/hqplayerd/rygel.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 22 files changed, 41 insertions(+), 45 deletions(-) rename pkgs/{development/libraries/tracker/default.nix => by-name/ti/tinysparql/package.nix} (97%) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 808936f49e60..52be4a8f90a7 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -678,7 +678,7 @@ Some projects, especially GNOME applications, are built with the Meson Build Sys , blueprint-compiler , libadwaita , libsecret -, tracker +, tinysparql }: stdenv.mkDerivation rec { @@ -712,7 +712,7 @@ stdenv.mkDerivation rec { buildInputs = [ libadwaita libsecret - tracker + tinysparql ]; # ... diff --git a/nixos/modules/services/desktops/gnome/tinysparql.nix b/nixos/modules/services/desktops/gnome/tinysparql.nix index 13c19479f75e..5962eff09b49 100644 --- a/nixos/modules/services/desktops/gnome/tinysparql.nix +++ b/nixos/modules/services/desktops/gnome/tinysparql.nix @@ -69,11 +69,11 @@ in config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.tracker ]; + environment.systemPackages = [ pkgs.tinysparql ]; - services.dbus.packages = [ pkgs.tracker ]; + services.dbus.packages = [ pkgs.tinysparql ]; - systemd.packages = [ pkgs.tracker ]; + systemd.packages = [ pkgs.tinysparql ]; }; diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 87455fede558..6aad3a4b51ff 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -27,7 +27,7 @@ , nixosTests , pkg-config , python3 -, tracker +, tinysparql , localsearch , wrapGAppsHook3 }: @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { libdazzle libportal-gtk3 libhandy - tracker + tinysparql localsearch # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema at-spi2-core # for tests diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index d53871476bd1..3b4f550c64ba 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -15,7 +15,7 @@ , libgee , libgtop , gnome -, tracker +, tinysparql }: stdenv.mkDerivation rec { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { libadwaita libgee libgtop - tracker + tinysparql ]; postPatch = '' diff --git a/pkgs/applications/misc/health/default.nix b/pkgs/applications/misc/health/default.nix index 8ff79b36a515..499a190dd355 100644 --- a/pkgs/applications/misc/health/default.nix +++ b/pkgs/applications/misc/health/default.nix @@ -11,7 +11,7 @@ , blueprint-compiler , libadwaita , libsecret -, tracker +, tinysparql , darwin }: @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ libadwaita libsecret - tracker + tinysparql ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security darwin.apple_sdk.frameworks.Foundation diff --git a/pkgs/by-name/gn/gnome-applets/package.nix b/pkgs/by-name/gn/gnome-applets/package.nix index 739475b78082..82ccfecff221 100644 --- a/pkgs/by-name/gn/gnome-applets/package.nix +++ b/pkgs/by-name/gn/gnome-applets/package.nix @@ -18,7 +18,7 @@ adwaita-icon-theme, libgweather, gucharmap, - tracker, + tinysparql, polkit, gnome, }: @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { adwaita-icon-theme libgweather gucharmap - tracker + tinysparql polkit wirelesstools linuxPackages.cpupower diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index e93caa6137c1..956710520ecc 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -60,7 +60,7 @@ shadow, shared-mime-info, sound-theme-freedesktop, - tracker, + tinysparql, localsearch, tzdata, udisks2, @@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: { networkmanager polkit samba - tracker + tinysparql localsearch # for search locations dialog udisks2 upower diff --git a/pkgs/by-name/gn/gnome-music/package.nix b/pkgs/by-name/gn/gnome-music/package.nix index 4452a9cc8ada..0f8390788fc9 100644 --- a/pkgs/by-name/gn/gnome-music/package.nix +++ b/pkgs/by-name/gn/gnome-music/package.nix @@ -5,7 +5,7 @@ gettext, fetchurl, gdk-pixbuf, - tracker, + tinysparql, libxml2, python3, libnotify, @@ -68,7 +68,7 @@ python3.pkgs.buildPythonApplication rec { libsoup_3 libadwaita gsettings-desktop-schemas - tracker + tinysparql ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/by-name/gn/gnome-notes/package.nix b/pkgs/by-name/gn/gnome-notes/package.nix index 888f5285938e..6dba58e31292 100644 --- a/pkgs/by-name/gn/gnome-notes/package.nix +++ b/pkgs/by-name/gn/gnome-notes/package.nix @@ -24,7 +24,7 @@ adwaita-icon-theme, libxml2, gsettings-desktop-schemas, - tracker, + tinysparql, }: stdenv.mkDerivation rec { @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { curl libhandy webkitgtk_4_0 - tracker + tinysparql gnome-online-accounts gsettings-desktop-schemas evolution-data-server diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix index 8f1185713c5a..61dfd5fbc005 100644 --- a/pkgs/by-name/lo/localsearch/package.nix +++ b/pkgs/by-name/lo/localsearch/package.nix @@ -8,7 +8,7 @@ , itstool , libxslt , gexiv2 -, tracker +, tinysparql , meson , mesonEmulatorHook , ninja @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { giflib gexiv2 totem-pl-parser - tracker + tinysparql gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index 70a611cb50e7..a69a5a1253e2 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -25,7 +25,7 @@ libseccomp, librsvg, webp-pixbuf-loader, - tracker, + tinysparql, localsearch, gexiv2, libselinux, @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf libcloudproviders shared-mime-info - tracker + tinysparql localsearch gnome-autoar ]; diff --git a/pkgs/by-name/po/polari/package.nix b/pkgs/by-name/po/polari/package.nix index 69cee89770dd..75606d704197 100644 --- a/pkgs/by-name/po/polari/package.nix +++ b/pkgs/by-name/po/polari/package.nix @@ -14,7 +14,7 @@ desktop-file-utils, pkg-config, gtk4, - tracker, + tinysparql, libadwaita, gtk3, glib, @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk4 - tracker + tinysparql libadwaita gtk3 # for thumbnailer glib diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix index a5216e839922..4487d2dd7e93 100644 --- a/pkgs/by-name/ry/rygel/package.nix +++ b/pkgs/by-name/ry/rygel/package.nix @@ -24,7 +24,7 @@ , libmediaart , sqlite , systemd -, tracker +, tinysparql , shared-mime-info , gnome }: @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { libmediaart sqlite systemd - tracker + tinysparql shared-mime-info ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/by-name/ti/tinysparql/package.nix similarity index 97% rename from pkgs/development/libraries/tracker/default.nix rename to pkgs/by-name/ti/tinysparql/package.nix index 0238578819f3..279443d1292d 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/by-name/ti/tinysparql/package.nix @@ -164,10 +164,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gnome.updateScript { - packageName = finalAttrs.pname; - attrPath = "tracker"; - }; + updateScript = gnome.updateScript { packageName = finalAttrs.pname; }; tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/we/web-archives/package.nix b/pkgs/by-name/we/web-archives/package.nix index 2c052474489b..d59c456cc2c9 100644 --- a/pkgs/by-name/we/web-archives/package.nix +++ b/pkgs/by-name/we/web-archives/package.nix @@ -11,7 +11,7 @@ libzim-glib, sqlite, webkitgtk_4_1, - tracker, + tinysparql, libxml2, libisocodes, libhandy, @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { libzim-glib sqlite webkitgtk_4_1 - tracker + tinysparql libxml2 libisocodes libhandy diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 128ed788f43f..35ee18f16257 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -22,7 +22,7 @@ , gom , json-glib , avahi -, tracker +, tinysparql , dleyna-server , itstool , totem-pl-parser @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { json-glib avahi libmediaart - tracker + tinysparql dleyna-server gst_all_1.gstreamer ]; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 7f3717c8a525..984ab02bf645 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -34,7 +34,7 @@ , gsettings-desktop-schemas , sassc , trackerSupport ? stdenv.hostPlatform.isLinux && (stdenv.buildPlatform == stdenv.hostPlatform) -, tracker +, tinysparql , x11Support ? stdenv.hostPlatform.isLinux , waylandSupport ? stdenv.hostPlatform.isLinux , libGL @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] ++ lib.optionals trackerSupport [ - tracker + tinysparql ]; #TODO: colord? diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index fba2d44a1d49..ed70b48617ee 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -34,7 +34,7 @@ , gst_all_1 , sassc , trackerSupport ? stdenv.hostPlatform.isLinux -, tracker +, tinysparql , x11Support ? stdenv.hostPlatform.isLinux , waylandSupport ? stdenv.hostPlatform.isLinux , libGL @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { ]) ++ lib.optionals stdenv.hostPlatform.isDarwin [ AppKit ] ++ lib.optionals trackerSupport [ - tracker + tinysparql ] ++ lib.optionals waylandSupport [ libGL wayland diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index ecc0982f2bff..63e2572614fa 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -2,7 +2,7 @@ , updateAutotoolsGnuConfigScriptsHook # for tests -, python3Packages, sqldiff, sqlite-analyzer, tracker +, python3Packages, sqldiff, sqlite-analyzer, tinysparql # uses readline & ncurses for a better interactive experience if set to true , interactive ? false @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { passthru = { tests = { inherit (python3Packages) sqlalchemy; - inherit sqldiff sqlite-analyzer tracker; + inherit sqldiff sqlite-analyzer tinysparql; }; updateScript = gitUpdater { diff --git a/pkgs/servers/hqplayerd/rygel.nix b/pkgs/servers/hqplayerd/rygel.nix index a8d97ee24076..a76680dfff8b 100644 --- a/pkgs/servers/hqplayerd/rygel.nix +++ b/pkgs/servers/hqplayerd/rygel.nix @@ -21,7 +21,7 @@ , libmediaart , sqlite , systemd -, tracker +, tinysparql , shared-mime-info , gnome }: @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { libmediaart sqlite systemd - tracker + tinysparql shared-mime-info ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 754dce675f90..549e01688593 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1612,6 +1612,7 @@ mapAliases { transmission-qt = lib.warn (transmission3Warning {suffix = "-qt";}) transmission_3-qt; # Added 2024-06-10 treefmt = treefmt2; # 2024-06-28 libtransmission = lib.warn (transmission3Warning {prefix = "lib";}) libtransmission_3; # Added 2024-06-10 + tracker = lib.warn "tracker has been renamed to tinysparql" tinysparql; # Added 2024-09-30 tracker-miners = lib.warn "tracker-miners has been renamed to localsearch" localsearch; # Added 2024-09-30 transfig = fig2dev; # Added 2022-02-15 transifex-client = transifex-cli; # Added 2023-12-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 491f6c861dea..4b571d52f6d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7201,8 +7201,6 @@ with pkgs; tsm-client-withGui = callPackage ../by-name/ts/tsm-client/package.nix { enableGui = true; }; - tracker = callPackage ../development/libraries/tracker { }; - tracy-x11 = callPackage ../by-name/tr/tracy/package.nix { withWayland = false; }; trivy = callPackage ../tools/admin/trivy { };