diff options
8 files changed, 12 insertions, 302 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 9f531d1bcc5..91492d561ba 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -406,15 +406,6 @@ in yelp ] config.environment.gnome3.excludePackages); - # Temporary hack until we can drop tracker 2. - services.dbus.packages = with pkgs.gnome3; - let - tracker2needed = removePackagesByName [ gnome-documents gnome-books ] config.environment.systemPackages != config.environment.systemPackages; - in - lib.optionals tracker2needed [ - pkgs.tracker_2 - ]; - # Enable default program modules # Since some of these have a corresponding package, we only # enable that program module if the package hasn't been excluded diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index 9685ffbd35c..e7ea02a2749 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -8,8 +8,8 @@ , pkgconfig , gtk3 , glib -, tracker_2 -, tracker-miners-2 +, tracker +, tracker-miners , libxslt , webkitgtk , gnome-desktop @@ -58,8 +58,8 @@ stdenv.mkDerivation rec { webkitgtk gjs gobject-introspection - tracker_2 - tracker-miners-2 + tracker + tracker-miners gnome-desktop libgepub ]; @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + broken = true; # Tracker 3 not supported and it cannot start Tracker 2. homepage = "https://wiki.gnome.org/Apps/Books"; description = "An e-book manager application for GNOME"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 7b0c6f0ac2f..ec1268f0770 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -9,8 +9,8 @@ , pkgconfig , gtk3 , glib -, tracker_2 -, tracker-miners-2 +, tracker +, tracker-miners , itstool , libxslt , webkitgtk @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { webkitgtk gjs gobject-introspection - tracker_2 - tracker-miners-2 + tracker + tracker-miners libgdata gnome-desktop libzapojit @@ -117,6 +117,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { + broken = true; # Tracker 3 not supported and it cannot start Tracker 2. homepage = "https://wiki.gnome.org/Apps/Documents"; description = "Document manager application designed to work with GNOME 3"; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index c2ed5b61977..f07d93d421c 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -16,7 +16,7 @@ , adwaita-icon-theme , libgweather , gucharmap -, tracker_2 +, tracker , polkit , gnome3 }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { adwaita-icon-theme libgweather gucharmap - tracker_2 + # tracker # Tracker 3 not supported. polkit wirelesstools linuxPackages.cpupower diff --git a/pkgs/development/libraries/tracker-miners/2.x/default.nix b/pkgs/development/libraries/tracker-miners/2.x/default.nix deleted file mode 100644 index 60c4b0a9eda..00000000000 --- a/pkgs/development/libraries/tracker-miners/2.x/default.nix +++ /dev/null @@ -1,139 +0,0 @@ -{ stdenv -, fetchurl -, substituteAll -, intltool -, itstool -, libxslt -, gexiv2 -, tracker_2 -, meson -, ninja -, pkgconfig -, vala -, wrapGAppsHook -, bzip2 -, dbus -, evolution-data-server -, exempi -, flac -, giflib -, glib -, gnome3 -, gst_all_1 -, icu -, json-glib -, libcue -, libexif -, libgrss -, libgsf -, libgxps -, libiptcdata -, libjpeg -, libosinfo -, libpng -, libseccomp -, libsoup -, libtiff -, libuuid -, libvorbis -, libxml2 -, poppler -, taglib -, upower -, totem-pl-parser -}: - -stdenv.mkDerivation rec { - pname = "tracker-miners"; - version = "2.3.5"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ymrwpgm3gwdgdgjxg26z732lsab4g8mppzlb0q27kcsn9zx62cm"; - }; - - nativeBuildInputs = [ - intltool - itstool - libxslt - meson - ninja - pkgconfig - vala - wrapGAppsHook - ]; - - # TODO: add libenca, libosinfo - buildInputs = [ - bzip2 - dbus - evolution-data-server - exempi - flac - giflib - glib - gexiv2 - totem-pl-parser - tracker_2 - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - icu - json-glib - libcue - libexif - libgrss - libgsf - libgxps - libiptcdata - libjpeg - libosinfo - libpng - libseccomp - libsoup - libtiff - libuuid - libvorbis - libxml2 - poppler - taglib - upower - ]; - - mesonFlags = [ - # TODO: tests do not like our sandbox - "-Dfunctional_tests=false" - "-Ddbus_services=${placeholder "out"}/share/dbus-1/services" - "-Dsystemd_user_services=${placeholder "out"}/lib/systemd/user" - ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit tracker_2; - }) - # https://bugzilla.gnome.org/show_bug.cgi?id=795576 - (fetchurl { - url = "https://bugzilla.gnome.org/attachment.cgi?id=371427"; - sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf"; - }) - ]; - - postInstall = '' - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with stdenv.lib; { - homepage = "https://wiki.gnome.org/Projects/Tracker"; - description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/tracker-miners/2.x/fix-paths.patch b/pkgs/development/libraries/tracker-miners/2.x/fix-paths.patch deleted file mode 100644 index f0c4449f045..00000000000 --- a/pkgs/development/libraries/tracker-miners/2.x/fix-paths.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/libtracker-miners-common/tracker-domain-ontology.c -+++ b/src/libtracker-miners-common/tracker-domain-ontology.c -@@ -323,7 +323,7 @@ - goto end; - } - } else { -- path = g_build_filename (SHAREDIR, "tracker", "domain-ontologies", -+ path = g_build_filename ("@tracker_2@", "share", "tracker", "domain-ontologies", - DEFAULT_RULE, NULL); - - if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { diff --git a/pkgs/development/libraries/tracker/2.x/default.nix b/pkgs/development/libraries/tracker/2.x/default.nix deleted file mode 100644 index 4c6f2292244..00000000000 --- a/pkgs/development/libraries/tracker/2.x/default.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ stdenv -, fetchurl -, gettext -, meson -, ninja -, pkgconfig -, gobject-introspection -, python3 -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_412 -, docbook_xml_dtd_43 -, docbook_xml_dtd_45 -, libxml2 -, glib -, wrapGAppsHook -, vala -, sqlite -, libxslt -, libstemmer -, gnome3 -, icu -, libuuid -, networkmanager -, libsoup -, json-glib -, systemd -, dbus -}: - -stdenv.mkDerivation rec { - pname = "tracker"; - version = "2.3.6"; - - outputs = [ "out" "dev" "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wpfgzwzazyi1d6m73hbdk8gfb30xnh3y73vnnknya9m449b87mx"; - }; - - nativeBuildInputs = [ - meson - ninja - vala - pkgconfig - gettext - libxslt - wrapGAppsHook - gobject-introspection - gtk-doc - docbook_xsl - docbook_xml_dtd_412 - docbook_xml_dtd_43 - docbook_xml_dtd_45 - python3 # for data-generators - systemd # used for checks to install systemd user service - dbus # used for checks and pkgconfig to install dbus service/s - ]; - - buildInputs = [ - glib - libxml2 - sqlite - icu - networkmanager - libsoup - libuuid - json-glib - libstemmer - ]; - - checkInputs = [ - python3.pkgs.pygobject3 - ]; - - mesonFlags = [ - # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas - # "-Dfunctional_tests=true" - "-Ddocs=true" - ]; - - doCheck = true; - - postPatch = '' - patchShebangs utils/g-ir-merge/g-ir-merge - patchShebangs utils/data-generators/cc/generate - patchShebangs tests/functional-tests/test-runner.sh.in - patchShebangs tests/functional-tests/*.py - ''; - - preCheck = '' - # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file - export HOME=$(mktemp -d) - - # Our gobject-introspection patches make the shared library paths absolute - # in the GIR files. When running functional tests, the library is not yet installed, - # though, so we need to replace the absolute path with a local one during build. - # We are using a symlink that will be overridden during installation. - mkdir -p $out/lib - ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0 - ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0 - ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so - ''; - - postCheck = '' - # Clean up out symlinks - rm -r $out/lib - ''; - - postInstall = '' - glib-compile-schemas "$out/share/glib-2.0/schemas" - ''; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - versionPolicy = "none"; - }; - }; - - meta = with stdenv.lib; { - homepage = "https://wiki.gnome.org/Projects/Tracker"; - description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27e7730883a..363a513e5e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3400,12 +3400,8 @@ in tracker = callPackage ../development/libraries/tracker { }; - tracker_2 = callPackage ../development/libraries/tracker/2.x { }; - tracker-miners = callPackage ../development/libraries/tracker-miners { }; - tracker-miners-2 = callPackage ../development/libraries/tracker-miners/2.x { }; - tracy = callPackage ../development/tools/tracy { inherit (darwin.apple_sdk.frameworks) Carbon AppKit; }; |