Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7990c3ea401f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6866a74a851a
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 17, 2019

  1. gnome3.tracker: 2.1.6 -> 2.1.8 

    Fixes NixOS/nixpkgs#59772

Also fix path to gdbus in the autostart.

https://gitlab.gnome.org/GNOME/tracker/blob/2.1.8/NEWS
    @worldofpeace
    worldofpeace committed Apr 17, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    a0e8dfd View commit details

Commits on Apr 18, 2019

  1. Merge pull request #59788 from worldofpeace/stable-tracker-update 

    [19.03] gnome3.tracker: 2.1.6 -> 2.1.8
    @worldofpeace
    worldofpeace authored Apr 18, 2019
    Copy the full SHA
    80e68d5 View commit details

  2. atom: bump 

    (cherry picked from commit f27690a)
Signed-off-by: Domen Kožar <domen@dev.si>
    @domenkozar
    domenkozar committed Apr 18, 2019
    Copy the full SHA
    6866a74 View commit details
Showing with 25 additions and 21 deletions.
  1. +4 −4 pkgs/applications/editors/atom/default.nix
  2. +8 −17 pkgs/desktops/gnome-3/core/tracker/default.nix
  3. +13 −0 pkgs/desktops/gnome-3/core/tracker/fix-paths.patch
8 changes: 4 additions & 4 deletions pkgs/applications/editors/atom/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,14 +3,14 @@
let
versions = {
atom = {
version = "1.34.0";
sha256 = "16hrjymrc43izg7frcrk7cwjwwrclcxzcwb5iw2llzjc6iadzlkb";
version = "1.36.0";
sha256 = "1ljg39h5xjigk2njvxyinb1gd3sbja21v47c7va6vl9hjr5xb3fr";
};

atom-beta = {
version = "1.35.0";
version = "1.37.0";
beta = 0;
sha256 = "0gm5k573dq1hhnyw3719f5k1c6rsz872mhzg8q53n89y0g2r5xmw";
sha256 = "0aq8r5vfgq7r31qajjgcg4n5a57a2m8fvq6fzy9vq5gawkvmaxxx";
};
};

25 changes: 8 additions & 17 deletions pkgs/desktops/gnome-3/core/tracker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{ stdenv, fetchurl, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gobject-introspection, python2
, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales
, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer
, gnome3, icu, libuuid, networkmanager, libsoup, json-glib }:
, gnome3, icu, libuuid, networkmanager, libsoup, json-glib, substituteAll }:

let
pname = "tracker";
version = "2.1.6";
version = "2.1.8";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

outputs = [ "out" "dev" "devdoc" ];

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "143zapq50lggj3mpqg2y4rh1hgnkbn9vgvzpqxr7waiawsmx0awq";
sha256 = "0a2m0472k245k95w527d6cb4i0p8ns8z5vxh0mcx33wbh41k9jya";
};

nativeBuildInputs = [
@@ -29,31 +29,22 @@ in stdenv.mkDerivation rec {
LC_ALL = "en_US.UTF-8";

mesonFlags = [
"-Ddbus_services=share/dbus-1/services"
"-Dsystemd_user_services=lib/systemd/user"
"-Ddbus_services=${placeholder ''out''}/share/dbus-1/services"
"-Dsystemd_user_services=${placeholder ''out''}/lib/systemd/user"
# TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas
"-Dfunctional_tests=false"
];

patches = [
# Always generate tracker-sparql.h in time
(fetchurl {
url = https://gitlab.gnome.org/GNOME/tracker/commit/3cbfaa5b374e615098e60eb4430f108b642ebe76.diff;
sha256 = "0smavzvsglpghggrcl8sjflki13nh7pr0jl2yv6ymbf5hr1c4dws";
(substituteAll {
src = ./fix-paths.patch;
gdbus = "${glib.bin}/bin/gdbus";
})
];

postPatch = ''
patchShebangs utils/g-ir-merge/g-ir-merge
patchShebangs utils/data-generators/cc/generate
# make .desktop Exec absolute
patch -p0 <<END_PATCH
+++ src/tracker-store/tracker-store.desktop.in.in
@@ -4 +4 @@
-Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
+Exec=${glib.dev}/bin/gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
END_PATCH
'';

postInstall = ''
13 changes: 13 additions & 0 deletions pkgs/desktops/gnome-3/core/tracker/fix-paths.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/tracker-store/tracker-store.desktop.in.in b/src/tracker-store/tracker-store.desktop.in.in
index e0a3fefeb..0d8fcb024 100644
--- a/src/tracker-store/tracker-store.desktop.in.in
+++ b/src/tracker-store/tracker-store.desktop.in.in
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Tracker Store
_Comment=Metadata database store and lookup manager
-Exec=gdbus call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
+Exec=@gdbus@ call -e -d org.freedesktop.DBus -o /org/freedesktop/DBus -m org.freedesktop.DBus.StartServiceByName org.freedesktop.Tracker1 0
Terminal=false
Type=Application
Categories=Utility;