diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/tracker')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/tracker/default.nix | 24 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/tracker/fix-paths.patch | 13 |
2 files changed, 5 insertions, 32 deletions
diff --git a/nixpkgs/pkgs/development/libraries/tracker/default.nix b/nixpkgs/pkgs/development/libraries/tracker/default.nix index 68a29919f0aa..5cb3dc73daa8 100644 --- a/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , gettext , meson , ninja @@ -26,34 +25,19 @@ , json-glib , systemd , dbus -, substituteAll }: stdenv.mkDerivation rec { pname = "tracker"; - version = "3.2.1"; + version = "3.3.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "GEfgiznm5h2EhzWqH5f32WwDggFlP6DXy56Bs365wDo="; + sha256 = "Bwb5b+f5XfQqzsgSwd57RZOg1kgyHKg1BqnXHiJBe9o="; }; - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit asciidoc; - }) - - # Filter out hidden (wrapped) subcommands - # https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/481 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/tracker/-/commit/8c28c24e447f13da8cf804cd7a00f9b909c5d3f9.patch"; - sha256 = "EYo1nOtEr4semaPC5wk6A7bliRXu8qsBHaltd0DEI6Y="; - }) - ]; - nativeBuildInputs = [ meson ninja @@ -119,7 +103,9 @@ stdenv.mkDerivation rec { dbus-run-session \ --config-file=${dbus.daemon}/share/dbus-1/session.conf \ - meson test --print-errorlogs + meson test \ + --timeout-multiplier 2 \ + --print-errorlogs runHook postCheck ''; diff --git a/nixpkgs/pkgs/development/libraries/tracker/fix-paths.patch b/nixpkgs/pkgs/development/libraries/tracker/fix-paths.patch deleted file mode 100644 index 5e4d8657f7bc..000000000000 --- a/nixpkgs/pkgs/development/libraries/tracker/fix-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build -index f90c757cf..40d9c939d 100644 ---- a/docs/manpages/meson.build -+++ b/docs/manpages/meson.build -@@ -32,7 +32,7 @@ foreach m : manpages - command: [xsltproc, - '--output', '@OUTPUT@', - '--stringparam', 'man.authors.section.enabled', '0', -- '/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], -+ '@asciidoc@/etc/asciidoc/docbook-xsl/manpage.xsl', '@INPUT@'], - input: xml, - output: manpage, - install: true, |