···

       
12
       
12
       
 
       
<itemizedlist>

     

       
13
       
13
       
 
       
  <listitem>

     

       
14
       
14
       
 
       
    <para>

     

       
15
       
15
       
+
       
      The Gnome version is now 3.24.

     

       
16
       
16
       
+
       
    </para>

     

       
17
       
17
       
+
       
  </listitem>

     

       
18
       
18
       
+
       
  <listitem>

     

       
19
       
19
       
+
       
    <para>

     

       
15
       
20
       
 
       
      The user handling now keeps track of deallocated UIDs/GIDs. When a user

     

       
16
       
21
       
 
       
      or group is revived, this allows it to be allocated the UID/GID it had before.

     

       
17
       
22
       
 
       
      A consequence is that UIDs and GIDs are no longer reused.

     
···

       
207
       
212
       
 
       
  <listitem>

     

       
208
       
213
       
 
       
    <para>

     

       
209
       
214
       
 
       
      Nixpkgs overlays may now be specified with a file as well as a directory. The

     

       
210
       
210
       
-
       
      value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and 

     

       
215
       
215
       
+
       
      value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and

     

       
211
       
216
       
 
       
      <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the

     

       
212
       
217
       
 
       
      <filename>~/.config/nixpkgs/overalys</filename> directory.

     

       
213
       
218
       
 
       
    </para>

     

···

       
103
       
103
       
 
       
            (filter (arg: arg != "-terminate") cfg.xserverArgs);

     

       
104
       
104
       
 
       
          GDM_SESSIONS_DIR = "${cfg.session.desktops}";

     

       
105
       
105
       
 
       
          # Find the mouse

     

       
106
       
106
       
-
       
          XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";

     

       
106
       
106
       
+
       
          XCURSOR_PATH = "~/.icons:${gnome3.adwaita-icon-theme}/share/icons";

     

       
107
       
107
       
 
       
        };

     

       
108
       
108
       
 
       
        execCmd = "exec ${gdm}/bin/gdm";

     

       
109
       
109
       
 
       
      };

     

       
110
       
110
       
 
       


     

       
111
       
111
       
 
       
    # Because sd_login_monitor_new requires /run/systemd/machines

     

       
112
       
112
       
 
       
    systemd.services.display-manager.wants = [ "systemd-machined.service" ];

     

       
113
       
113
       
-
       
    systemd.services.display-manager.after = [ "systemd-machined.service" ];

     

       
113
       
113
       
+
       
    systemd.services.display-manager.after = [

     

       
114
       
114
       
+
       
      "rc-local.service"

     

       
115
       
115
       
+
       
      "systemd-machined.service"

     

       
116
       
116
       
+
       
      "systemd-user-sessions.service"

     

       
117
       
117
       
+
       
      "getty@tty1.service"

     

       
118
       
118
       
+
       
    ];

     

       
119
       
119
       
+
       


     

       
120
       
120
       
+
       
    systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];

     

       
121
       
121
       
+
       
    systemd.services.display-manager.serviceConfig = {

     

       
122
       
122
       
+
       
        # Restart = "always"; - already defined in xserver.nix

     

       
123
       
123
       
+
       
        KillMode = "mixed";

     

       
124
       
124
       
+
       
        IgnoreSIGPIPE = "no";

     

       
125
       
125
       
+
       
        BusName = "org.gnome.DisplayManager";

     

       
126
       
126
       
+
       
        StandardOutput = "syslog";

     

       
127
       
127
       
+
       
        StandardError = "inherit";

     

       
128
       
128
       
+
       
    };

     

       
114
       
129
       
 
       


     

       
115
       
130
       
 
       
    systemd.services.display-manager.path = [ gnome3.gnome_session ];

     

       
116
       
131
       
 
       


     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "bijiben-3.21.2";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/bijiben/3.21/bijiben-3.21.2.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "d7f05abd82da837d8d48d9f7acc6035a289d934c722fc89870d17007ba158e0d";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "cheese-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/cheese/3.22/cheese-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "0b52e4b0021cfb86a5abbd17356b72693f724892165d91b3ff7f5031a1ce53ea";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
2
       
2
       
 
       
, pkgconfig, gtk3, glib, libnotify, gtkspell3

     

       
3
       
3
       
 
       
, wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite

     

       
4
       
4
       
 
       
, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool

     

       
5
       
5
       
-
       
, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap}:

     

       
5
       
5
       
+
       
, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap

     

       
6
       
6
       
+
       
, cmake}:

     

       
6
       
7
       
 
       


     

       
7
       
8
       
 
       
let

     

       
8
       
9
       
 
       
  majVer = gnome3.version;

     
···

       
24
       
25
       
 
       
                  gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit

     

       
25
       
26
       
 
       
                  nss nspr libnotify procps highlight gnome3.libgweather

     

       
26
       
27
       
 
       
                  gnome3.gsettings_desktop_schemas

     

       
27
       
27
       
-
       
                  gnome3.libgnome_keyring gnome3.glib_networking openldap ];

     

       
28
       
28
       
+
       
                  gnome3.libgnome_keyring gnome3.glib_networking openldap

     

       
29
       
29
       
+
       
                  cmake

     

       
30
       
30
       
+
       
                ];

     

       
28
       
31
       
 
       


     

       
29
       
32
       
 
       
  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

     

       
30
       
33
       
 
       


     

       
31
       
34
       
 
       


     

       
32
       
35
       
 
       
  configureFlags = [ "--disable-pst-import" "--disable-autoar"

     

       
33
       
36
       
 
       
                     "--disable-libcryptui" "--with-openldap"];

     

       
37
       
37
       
+
       


     

       
38
       
38
       
+
       
  cmakeFlags = [ "-DENABLE_AUTOAR=OFF" "-DENABLE_LIBCRYPTUI=OFF"

     

       
39
       
39
       
+
       
                 "-DENABLE_YTNEF=OFF" "-DENABLE_PST_IMPORT=OFF"

     

       
40
       
40
       
+
       
               ];

     

       
34
       
41
       
 
       


     

       
35
       
42
       
 
       
  NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";

     

       
36
       
43
       
 
       


     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "evolution-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/evolution/3.22/evolution-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "3e4742032b450cd8752097ba7e56302134e3653d510d4c53196654fb353ebbeb";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "file-roller-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/file-roller/3.22/file-roller-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "5065b71d43deb3dc3c7af6efa3f3b1188a63bfafb213be86af1d262b1dc11d42";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-boxes-3.22.4";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.4.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "1wngw4c052p5ghdsd0mdrn20yi8xs0hjdq30rdwv9sqh40liqnjq";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-calendar-3.22.1";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-calendar/3.22/gnome-calendar-3.22.1.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "e6a3670c63122c4b37fbe243a54486e019c1bfd9a27c709234fb81b9e0c13360";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
  buildInputs = [

     

       
8
       
8
       
 
       
    pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf

     

       
9
       
9
       
-
       
    librsvg gnome3.defaultIconTheme

     

       
9
       
9
       
+
       
    librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme

     

       
10
       
10
       
 
       
  ];

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
  meta = with stdenv.lib; {

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-characters-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-characters/3.22/gnome-characters-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "0778b625646d6d934cf252d58a2e16403889da6bfc237bdca1d3cb3258f63d4e";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-clocks-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-clocks/3.22/gnome-clocks-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "cdcd4ccd9716e7f12487a80d1b173aa28d9bde536d6274fbbc31acd6606c0511";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-documents-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-documents/3.22/gnome-documents-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "edf5cd6b7b7f5847217b60885358030598e551010087d2a9d1765ae6777041ad";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-getting-started-docs-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-getting-started-docs/3.22/gnome-getting-started-docs-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "22b11fb4f6fd9f6d595dc01d5989fb1652c9a63732a4d1c997f3f5f82da75722";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  buildInputs = [

     

       
10
       
10
       
 
       
    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2

     

       
11
       
11
       
-
       
    systemd gnome3.defaultIconTheme

     

       
11
       
11
       
+
       
    systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme

     

       
12
       
12
       
 
       
  ];

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  meta = with stdenv.lib; {

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-logs-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-logs/3.22/gnome-logs-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "114da79579d69840904970b2b3a72dc8f6be76a5673174b6628b42fd6781eb4f";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3

     

       
2
       
2
       
-
       
, gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook

     

       
2
       
2
       
+
       
, gobjectIntrospection, gdk_pixbuf, librsvg, libgweather, autoreconfHook

     

       
3
       
3
       
 
       
, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup

     

       
4
       
4
       
 
       
, webkitgtk }:

     

       
5
       
5
       
 
       


     
···

       
11
       
11
       
 
       
  buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook

     

       
12
       
12
       
 
       
                  gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph

     

       
13
       
13
       
 
       
                  gnome3.geocode_glib libchamplain file libsoup

     

       
14
       
14
       
-
       
                  gdk_pixbuf librsvg autoreconfHook

     

       
14
       
14
       
+
       
                  gdk_pixbuf librsvg libgweather autoreconfHook

     

       
15
       
15
       
 
       
                  gnome3.gsettings_desktop_schemas gnome3.evolution_data_server

     

       
16
       
16
       
 
       
                  gnome3.gnome_online_accounts gnome3.defaultIconTheme

     

       
17
       
17
       
 
       
                  webkitgtk ];

     

       
18
       
18
       
 
       


     

       
19
       
19
       
-
       
  patches = [ ./soup.patch ];

     

       
19
       
19
       
+
       
  # The .service file isn't wrapped with the correct environment

     

       
20
       
20
       
+
       
  # so misses GIR files when started. By re-pointing from the gjs

     

       
21
       
21
       
+
       
  # entry point to the wrapped binary we get back to a wrapped

     

       
22
       
22
       
+
       
  # binary.

     

       
23
       
23
       
+
       
  preConfigure = ''

     

       
24
       
24
       
+
       
    substituteInPlace "data/org.gnome.Maps.service.in" \

     

       
25
       
25
       
+
       
        --replace "Exec=@pkgdatadir@/org.gnome.Maps" \

     

       
26
       
26
       
+
       
                  "Exec=$out/bin/gnome-maps"

     

       
27
       
27
       
+
       
  '';

     

       
20
       
28
       
 
       


     

       
21
       
29
       
 
       
  meta = with stdenv.lib; {

     

       
22
       
30
       
 
       
    homepage = https://wiki.gnome.org/Apps/Maps;

     

···

       
1
       
1
       
-
       
--- gnome-maps-3.18.0/configure.ac.orig	2015-09-24 18:38:31.912498368 +0200

     

       
2
       
2
       
-
       
+++ gnome-maps-3.18.0/configure.ac	2015-09-24 18:38:40.783320413 +0200

     

       
3
       
3
       
-
       
@@ -50,8 +50,9 @@

     

       
4
       
4
       
-
       
     folks                        >= $FOLKS_MIN_VERSION

     

       
5
       
5
       
-
       
     geocode-glib-1.0             >= $GEOCODE_MIN_VERSION

     

       
6
       
6
       
-
       
     champlain-0.12               >= $CHAMPLAIN_MIN_VERSION

     

       
7
       
7
       
-
       
     libxml-2.0

     

       
8
       
8
       
-
       
     rest-0.7

     

       
9
       
9
       
-
       
+    libsoup-2.4

     

       
10
       
10
       
-
       
 ])

     

       
11
       
11
       
-
       
 AC_SUBST(GNOME_MAPS_LIB_CFLAGS)

     

       
12
       
12
       
-
       
 AC_SUBST(GNOME_MAPS_LIB_LIBS)

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-maps-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-maps/3.22/gnome-maps-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "7ce98a683f1c38d3ba1b5d68c7d05add9f9366774678fd50fdeeda6987163c39";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-music-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-music/3.22/gnome-music-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "170685ffa89556951b9fb0b9225b2bca863e54348d4079a56b8e5c4eeafa9b03";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
2
       
2
       
 
       
, pkgconfig, gtk3, glib

     

       
3
       
3
       
 
       
, makeWrapper, itstool, gegl, babl, lcms2

     

       
4
       
4
       
 
       
, desktop_file_utils, gmp, libmediaart, wrapGAppsHook

     

       
5
       
5
       
-
       
, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2 }:

     

       
5
       
5
       
+
       
, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib }:

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
stdenv.mkDerivation rec {

     

       
8
       
8
       
 
       
  inherit (import ./src.nix fetchurl) name src;

     
···

       
17
       
17
       
 
       
                  gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo

     

       
18
       
18
       
 
       
                  gnome3.gnome_online_accounts gnome3.gnome_desktop

     

       
19
       
19
       
 
       
                  lcms2 libexif gnome3.tracker libxml2 desktop_file_utils

     

       
20
       
20
       
-
       
                  wrapGAppsHook gexiv2 ];

     

       
20
       
20
       
+
       
                  wrapGAppsHook gexiv2 geocode_glib ];

     

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
  enableParallelBuilding = true;

     

       
23
       
23
       
 
       


     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-photos-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-photos/3.22/gnome-photos-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "568329142855901a85f325ee014176e24f735b15a496842bcd31f5cb2615ba53";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs

     

       
2
       
2
       
-
       
, libgweather, intltool, itstool, geoclue2 }:

     

       
3
       
3
       
-
       


     

       
4
       
4
       
-
       
stdenv.mkDerivation rec {

     

       
5
       
5
       
-
       
  inherit (import ./src.nix fetchurl) name src;

     

       
6
       
6
       
-
       


     

       
7
       
7
       
-
       
  buildInputs = [

     

       
8
       
8
       
-
       
    pkgconfig gtk3 wrapGAppsHook gjs intltool itstool

     

       
9
       
9
       
-
       
    libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas

     

       
10
       
10
       
-
       
  ];

     

       
11
       
11
       
-
       


     

       
12
       
12
       
-
       
  meta = with stdenv.lib; {

     

       
13
       
13
       
-
       
    homepage = https://wiki.gnome.org/Apps/Weather;

     

       
14
       
14
       
-
       
    description = "Access current weather conditions and forecasts";

     

       
15
       
15
       
-
       
    maintainers = gnome3.maintainers;

     

       
16
       
16
       
-
       
    license = licenses.gpl2;

     

       
17
       
17
       
-
       
    platforms = platforms.linux;

     

       
18
       
18
       
-
       
  };

     

       
19
       
19
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-weather-3.20.2";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-weather/3.20/gnome-weather-3.20.2.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "7823ca7c08fa852232b98c2517830e3bd9b0ab80c9ac83f182c18ec140a5c18b";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
 
       
{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme

     

       
2
       
2
       
 
       
, telepathy_glib, gjs, itstool, telepathy_idle, libxml2

     

       
3
       
3
       
 
       
, pkgconfig, gtk3, glib, librsvg, libsecret, libsoup

     

       
4
       
4
       
-
       
, gnome3, wrapGAppsHook, telepathy_logger }:

     

       
4
       
4
       
+
       
, gnome3, wrapGAppsHook, telepathy_logger, gspell }:

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
stdenv.mkDerivation rec {

     

       
7
       
7
       
 
       
  inherit (import ./src.nix fetchurl) name src;

     
···

       
9
       
9
       
 
       
  propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ];

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
  buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas

     

       
12
       
12
       
-
       
                  telepathy_glib telepathy_logger gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ];

     

       
12
       
12
       
+
       
                  telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ];

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  enableParallelBuilding = true;

     

       
15
       
15
       
 
       


     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "polari-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/polari/3.22/polari-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "90ea3db7ed0a03d46d9376e3201b4332f56d6149bc284379c367159094b73818";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "adwaita-icon-theme-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "baobab-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/baobab/3.22/baobab-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "796e784886d5bdf2e9d8ac94d74d5f94e055f4285ef54dc16552fb9c9b9c3e99";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
13
       
13
       
 
       
  };

     

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
  nativeBuildInputs = [ pkgconfig autoreconfHook ];

     

       
16
       
16
       
+
       


     

       
16
       
17
       
 
       
  buildInputs = with gnome3;

     

       
17
       
18
       
 
       
    [ glib gtk clutter at_spi2_core dbus pythonPackages.python

     

       
18
       
19
       
 
       
      pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ];

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "eog-3.20.4";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/eog/3.20/eog-3.20.3.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "09ic1ndvl31jnlsmigd5dgdv262ybq61ik0xh35kmvgcklw8qc0n";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
2
       
2
       
 
       
, bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool

     

       
3
       
3
       
 
       
, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit

     

       
4
       
4
       
 
       
, sqlite, gcr, avahi, nss, isocodes, itstool, file, which

     

       
5
       
5
       
-
       
, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }:

     

       
5
       
5
       
+
       
, gdk_pixbuf, librsvg, gnome_common, gst_all_1, json_glib }:

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
stdenv.mkDerivation rec {

     

       
8
       
8
       
 
       
  inherit (import ./src.nix fetchurl) name src;

     
···

       
21
       
21
       
 
       
                  gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf

     

       
22
       
22
       
 
       
                  gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base

     

       
23
       
23
       
 
       
                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly

     

       
24
       
24
       
-
       
                  gst_all_1.gst-libav];

     

       
24
       
24
       
+
       
                  gst_all_1.gst-libav json_glib ];

     

       
25
       
25
       
 
       


     

       
26
       
26
       
 
       
  NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";

     

       
27
       
27
       
 
       


     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "epiphany-3.22.6";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.5.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "0ib7z8x65gcr6vc6709df1rngcfrp3xn5ywqlrnc2xrsynrhghz9";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
10
       
10
       
 
       
stdenv.mkDerivation rec {

     

       
11
       
11
       
 
       
  inherit (import ./src.nix fetchurl) name src;

     

       
12
       
12
       
 
       


     

       
13
       
13
       
-
       
  patches = [

     

       
14
       
14
       
-
       
    (fetchpatch {

     

       
15
       
15
       
-
       
      name = "CVE-2017-1000083"; # https://bugzilla.gnome.org/show_bug.cgi?id=784630

     

       
16
       
16
       
-
       
      url = "https://git.gnome.org/browse/evince/patch/?id=fa072dbbfd96";

     

       
17
       
17
       
-
       
      sha256 = "12xg00jvbsh54dr2dyq2ha5a05x2bpzd1lh2k3sppq3h7a02lsjy";

     

       
18
       
18
       
-
       
    })

     

       
19
       
19
       
-
       
  ];

     

       
20
       
13
       
 
       
  # missing help for now; fixing the autogen phase seemed too difficult

     

       
21
       
14
       
 
       
  postPatch = "sed '/@YELP_HELP_RULES@/d' -i help/Makefile.am";

     

       
22
       
15
       
 
       


     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "evince-3.22.1";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/evince/3.22/evince-3.22.1.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
 
       
{ fetchurl, stdenv, pkgconfig, gnome3, python, dconf

     

       
2
       
2
       
 
       
, intltool, libsoup, libxml2, libsecret, icu, sqlite

     

       
3
       
3
       
-
       
, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }:

     

       
3
       
3
       
+
       
, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true,

     

       
4
       
4
       
+
       
vala_0_32, cmake, kerberos, openldap, webkitgtk, libaccounts-glib }:

     

       
4
       
5
       
 
       


     

       
5
       
6
       
 
       
stdenv.mkDerivation rec {

     

       
6
       
7
       
 
       
  inherit (import ./src.nix fetchurl) name src;

     

       
7
       
8
       
 
       


     

       
8
       
9
       
 
       
  buildInputs = with gnome3;

     

       
9
       
9
       
-
       
    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts (stdenv.lib.getLib dconf)

     

       
10
       
10
       
-
       
      gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]

     

       
10
       
10
       
+
       
    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts

     

       
11
       
11
       
+
       
      (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper

     

       
12
       
12
       
+
       
      icu sqlite gsettings_desktop_schemas cmake kerberos openldap webkitgtk

     

       
13
       
13
       
+
       
      libaccounts-glib ]

     

       
11
       
14
       
 
       
    ++ stdenv.lib.optional valaSupport vala_0_32;

     

       
12
       
15
       
 
       


     

       
13
       
16
       
 
       
  propagatedBuildInputs = [ libsecret nss nspr libical db ];

     

       
14
       
17
       
 
       


     

       
15
       
18
       
 
       
  # uoa irrelevant for now

     

       
16
       
16
       
-
       
  configureFlags = [ "--disable-uoa" "--disable-google-auth" ]

     

       
17
       
17
       
-
       
                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";

     

       
19
       
19
       
+
       
  cmakeFlags = [ "-DENABLE_UOA=OFF" "-DENABLE_GOA=OFF" ]

     

       
20
       
20
       
+
       
                   ++ stdenv.lib.optionals valaSupport [

     

       
21
       
21
       
+
       
                     "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON"

     

       
22
       
22
       
+
       
                     "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];

     

       
18
       
23
       
 
       


     

       
19
       
24
       
 
       
  enableParallelBuilding = true;

     

       
20
       
25
       
 
       


     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "evolution-data-server-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/evolution-data-server/3.22/evolution-data-server-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "8653a9a28980e661e8b91ba335dae04a0553e12611ad155bc48fb3fb3c98653d";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus

     

       
2
       
2
       
 
       
, intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook

     

       
3
       
3
       
-
       
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth }:

     

       
3
       
3
       
+
       
, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth

     

       
4
       
4
       
+
       
, librsvg }:

     

       
4
       
5
       
 
       


     

       
5
       
6
       
 
       
stdenv.mkDerivation rec {

     

       
6
       
7
       
 
       
  inherit (import ./src.nix fetchurl) name src;

     
···

       
18
       
19
       
 
       
  buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook

     

       
19
       
20
       
 
       
                  accountsservice gnome3.dconf systemd

     

       
20
       
21
       
 
       
                  gobjectIntrospection libX11 gtk

     

       
21
       
21
       
-
       
                  libcanberra_gtk3 pam libtool plymouth ];

     

       
22
       
22
       
+
       
                  libcanberra_gtk3 pam libtool plymouth librsvg ];

     

       
22
       
23
       
 
       


     

       
23
       
24
       
 
       
  enableParallelBuilding = true;

     

       
24
       
25
       
 
       


     

       
25
       
26
       
 
       
  # Disable Access Control because our X does not support FamilyServerInterpreted yet

     

       
26
       
26
       
-
       
  patches = [ ./xserver_path.patch

     

       
27
       
27
       
-
       
              ./sessions_dir.patch

     

       
27
       
27
       
+
       
  patches = [ ./sessions_dir.patch

     

       
28
       
28
       
 
       
              ./gdm-x-session_extra_args.patch

     

       
29
       
29
       
 
       
              ./gdm-session-worker_xserver-path.patch

     

       
30
       
30
       
-
       
             # ./disable_x_access_control.patch ./no-dbus-launch.patch

     

       
31
       
31
       
-
       
             # ./libsystemd.patch

     

       
32
       
30
       
 
       
             ];

     

       
33
       
31
       
 
       


     

       
34
       
32
       
 
       
  installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];

     

···

       
1
       
1
       
-
       
--- gdm-3.14.2/daemon/gdm-slave.c.orig	2015-04-16 15:05:27.844353079 +0200

     

       
2
       
2
       
-
       
+++ gdm-3.14.2/daemon/gdm-slave.c	2015-04-16 15:05:40.240417915 +0200

     

       
3
       
3
       
-
       
@@ -369,8 +369,9 @@

     

       
4
       
4
       
-
       
                 gdm_error_trap_push ();

     

       
5
       
5
       
-
       
 

     

       
6
       
6
       
-
       
                 for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {

     

       
7
       
7
       
-
       
-                        XAddHost (slave->priv->server_display, &host_entries[i]);

     

       
8
       
8
       
-
       
+                        //XAddHost (slave->priv->server_display, &host_entries[i]);

     

       
9
       
9
       
-
       
                 }

     

       
10
       
10
       
-
       
+                XDisableAccessControl(slave->priv->server_display);

     

       
11
       
11
       
-
       
 

     

       
12
       
12
       
-
       
                 XSync (slave->priv->server_display, False);

     

       
13
       
13
       
-
       
                 if (gdm_error_trap_pop ()) {

     

···

       
1
       
1
       
-
       
https://github.com/GNOME/gdm/commit/eee5bf72c9bb1c1d62eb0e7102088ae3b9a188cd

     

       
2
       
2
       
-
       
--- a/configure.ac	2016-05-27 11:10:44.589740789 +0200

     

       
3
       
3
       
-
       
+++ b/configure.ac	2016-05-27 11:11:00.146427723 +0200

     

       
4
       
4
       
-
       
@@ -888,7 +888,7 @@

     

       
5
       
5
       
-
       
 dnl ---------------------------------------------------------------------------

     

       
6
       
6
       
-
       
 

     

       
7
       
7
       
-
       
 PKG_CHECK_MODULES(SYSTEMD,

     

       
8
       
8
       
-
       
-                  [libsystemd-login >= 186 libsystemd-daemon],

     

       
9
       
9
       
-
       
+                  [libsystemd],

     

       
10
       
10
       
-
       
                   [have_systemd=yes], [have_systemd=no])

     

       
11
       
11
       
-
       
 

     

       
12
       
12
       
-
       
 if test "x$with_systemd" = "xauto" ; then

     

       
13
       
13
       
-
       
@@ -912,7 +912,7 @@

     

       
14
       
14
       
-
       
 AC_SUBST(SYSTEMD_LIBS)

     

       
15
       
15
       
-
       
 

     

       
16
       
16
       
-
       
 PKG_CHECK_MODULES(JOURNALD,

     

       
17
       
17
       
-
       
-                  [libsystemd-journal],

     

       
18
       
18
       
-
       
+                  [libsystemd],

     

       
19
       
19
       
-
       
                   [have_journald=yes], [have_journald=no])

     

       
20
       
20
       
-
       
 

     

       
21
       
21
       
-
       
 if test "x$enable_systemd_journal" = "xauto" ; then

     

···

       
1
       
1
       
-
       
--- a/daemon/gdm-launch-environment.c	2015-06-22 15:11:07.277474398 +0000

     

       
2
       
2
       
-
       
+++ b/daemon/gdm-launch-environment.c	2015-06-22 15:12:31.301157665 +0000

     

       
3
       
3
       
-
       
@@ -48,8 +48,6 @@

     

       
4
       
4
       
-
       
 #include "gdm-session-enum-types.h"

     

       
5
       
5
       
-
       
 #include "gdm-launch-environment.h"

     

       
6
       
6
       
-
       
 

     

       
7
       
7
       
-
       
-#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session"

     

       
8
       
8
       
-
       
-

     

       
9
       
9
       
-
       
 extern char **environ;

     

       
10
       
10
       
-
       
 

     

       
11
       
11
       
-
       
 #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate))

     

       
12
       
12
       
-
       
@@ -512,7 +510,7 @@

     

       
13
       
13
       
-
       
                 gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command);

     

       
14
       
14
       
-
       
         } else {

     

       
15
       
15
       
-
       
                 /* wrap it in dbus-launch */

     

       
16
       
16
       
-
       
-                char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command);

     

       
17
       
17
       
-
       
+                char *command = g_strdup (launch_environment->priv->command);

     

       
18
       
18
       
-
       
 

     

       
19
       
19
       
-
       
                 gdm_session_select_program (launch_environment->priv->session, command);

     

       
20
       
20
       
-
       
                 g_free (command);

     

···

       
1
       
1
       
-
       
diff --git a/daemon/gdm-session.c.orig b/daemon/gdm-session.c

     

       
2
       
2
       
-
       
index b839fea..053d4ac 100644

     

       
3
       
3
       
-
       
--- a/daemon/gdm-session.c.orig

     

       
4
       
4
       
-
       
+++ b/daemon/gdm-session.c

     

       
5
       
5
       
-
       
@@ -344,12 +344,16 @@ get_system_session_dirs (GdmSession *self)

     

       
6
       
6
       
-
       
 #ifdef ENABLE_WAYLAND_SUPPORT

     

       
7
       
7
       
-
       
                 DATADIR "/wayland-sessions/",

     

       
8
       
8
       
-
       
 #endif

     

       
9
       
9
       
-
       
+                "/var/empty",

     

       
10
       
10
       
-
       
                 "/etc/X11/sessions/",

     

       
11
       
11
       
-
       
                 DMCONFDIR "/Sessions/",

     

       
12
       
12
       
-
       
                 DATADIR "/gdm/BuiltInSessions/",

     

       
13
       
13
       
-
       
                 DATADIR "/xsessions/",

     

       
14
       
14
       
-
       
                 NULL

     

       
15
       
15
       
-
       
         };

     

       
16
       
16
       
-
       
+        if (getenv("GDM_SESSIONS_DIR") != NULL) {

     

       
17
       
17
       
-
       
+                search_dirs[1] = getenv("GDM_SESSIONS_DIR");

     

       
18
       
18
       
-
       
+        };

     

       
19
       
19
       
-
       
 

     

       
20
       
20
       
-
       
 #ifdef ENABLE_WAYLAND_SUPPORT

     

       
21
       
21
       
-
       
         if (self->priv->ignore_wayland) {

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gdm-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gdm/3.22/gdm-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "b9180d07c6a4a3fb0e8df6bcb4f333008cb3071f0ef81e02f081ff8a144f62d4";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
diff --git a/daemon/gdm-server.c.orig b/daemon/gdm-server.c

     

       
2
       
2
       
-
       
index 6357d34..5bef5c8 100644

     

       
3
       
3
       
-
       
--- a/daemon/gdm-server.c.orig

     

       
4
       
4
       
-
       
+++ b/daemon/gdm-server.c

     

       
5
       
5
       
-
       
@@ -264,7 +264,11 @@ gdm_server_init_command (GdmServer *server)

     

       
6
       
6
       
-
       
         return;

     

       
7
       
7
       
-
       
 

     

       
8
       
8
       
-
       
 fallback:

     

       
9
       
9
       
-
       
-        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);

     

       
10
       
10
       
-
       
+        if (g_getenv("GDM_X_SERVER") != NULL) {

     

       
11
       
11
       
-
       
+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));

     

       
12
       
12
       
-
       
+        } else {

     

       
13
       
13
       
-
       
+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);

     

       
14
       
14
       
-
       
+        }

     

       
15
       
15
       
-
       
 

     

       
16
       
16
       
-
       
 }

     

       
17
       
17
       
-
       


     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "geocode-glib-3.20.1";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/geocode-glib/3.20/geocode-glib-3.20.1.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "669fc832cabf8cc2f0fc4194a8fa464cdb9c03ebf9aca5353d7cf935ba8637a2";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
 
       
{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection

     

       
2
       
2
       
-
       
, spidermonkey_31, pango, readline, glib, libxml2, dbus }:

     

       
2
       
2
       
+
       
, spidermonkey_38, pango, readline, glib, libxml2, dbus }:

     

       
3
       
3
       
 
       


     

       
4
       
4
       
 
       
stdenv.mkDerivation rec {

     

       
5
       
5
       
 
       
  inherit (import ./src.nix fetchurl) name src;

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
  buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ];

     

       
8
       
8
       
 
       


     

       
9
       
9
       
-
       
  propagatedBuildInputs = [ spidermonkey_31 ];

     

       
9
       
9
       
+
       
  propagatedBuildInputs = [ spidermonkey_38 ];

     

       
10
       
10
       
+
       


     

       
11
       
11
       
+
       
  # GJS expects mozjs-38.pc but spidermonkey_38 only provides js.pc

     

       
12
       
12
       
+
       
  preConfigure = ''

     

       
13
       
13
       
+
       
    sed -i s/mozjs-38/js/ configure

     

       
14
       
14
       
+
       
  '';

     

       
10
       
15
       
 
       


     

       
11
       
16
       
 
       
  postInstall = ''

     

       
12
       
17
       
 
       
    sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: rec {

     

       
4
       
4
       
-
       
  name = "gjs-${major}.4";

     

       
5
       
5
       
-
       
  major = "1.47";

     

       
6
       
6
       
-
       


     

       
7
       
7
       
-
       
  src = fetchurl {

     

       
8
       
8
       
-
       
    url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz";

     

       
9
       
9
       
-
       
    sha256 = "05x9yk3h53wn9fpwbcxl8yz71znhwhzwy7412di77x88ghkxi2c1";

     

       
10
       
10
       
-
       
  };

     

       
11
       
11
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-backgrounds-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-backgrounds/3.22/gnome-backgrounds-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "6c83e01647375d5c409312d7215d038d705a3f214179227ed37d3158afdd001f";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-bluetooth-3.20.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "93b3ca16b348a168d044b3f777049b7dba2a9292c4adb2751a771e3bc5e4eb53";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
 
       
{ stdenv, intltool, fetchurl, pkgconfig, libxml2

     

       
2
       
2
       
 
       
, bash, gtk3, glib, wrapGAppsHook

     

       
3
       
3
       
-
       
, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }:

     

       
3
       
3
       
+
       
, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }:

     

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
stdenv.mkDerivation rec {

     

       
6
       
6
       
 
       
  inherit (import ./src.nix fetchurl) name src;

     
···

       
14
       
14
       
 
       
  buildInputs = [ bash gtk3 glib intltool itstool

     

       
15
       
15
       
 
       
                  libxml2 gnome3.gtksourceview mpfr gmp

     

       
16
       
16
       
 
       
                  gdk_pixbuf gnome3.defaultIconTheme librsvg

     

       
17
       
17
       
-
       
                  gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ];

     

       
17
       
17
       
+
       
                  gnome3.gsettings_desktop_schemas gnome3.dconf libsoup libmpc ];

     

       
18
       
18
       
 
       


     

       
19
       
19
       
 
       
  meta = with stdenv.lib; {

     

       
20
       
20
       
 
       
    homepage = https://wiki.gnome.org/action/show/Apps/Calculator;

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-calculator-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-calculator/3.22/gnome-calculator-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "fa0f192fc0cad43a8520d4015780ce008d9fc6201bd2dd6dc06365ba45458728";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-control-center-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-control-center/3.22/gnome-control-center-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "d264ae919aeeb27987dcdd5af5577fad0590e1f184f506b563c89f356aab5052";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-desktop-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-desktop/3.22/gnome-desktop-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "cff36ccd8d0a62177a4c1513ec70d13ead3b84fdc208ba54199cf7616f05644d";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-dictionary-3.20.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-dictionary/3.20/gnome-dictionary-3.20.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "efb36377d46eff9291d3b8fec37baab2355f9dc8bc7edb791b6a625574716121";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-disk-utility-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-disk-utility/3.22/gnome-disk-utility-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "757d4ff438e63ac337a8681c9ef184a36143b39494381b609cdf889128d7fb22";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-font-viewer-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-font-viewer/3.22/gnome-font-viewer-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "bd27cbc523016711508d7913878f32e262893cfcc7e10795171dbf8e35af9be0";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-online-accounts-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-online-accounts/3.22/gnome-online-accounts-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "aacce93a71bf5e687a45ae0d00f31ea0625ddd8143235d6d8c64c4ec21bbfa33";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-online-miners-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-online-miners/3.22/gnome-online-miners-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "bf51666866527b236d980fa3a0d036581a85987c59d604566ccb3ad685dd8bb8";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
 
       
{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower

     

       
2
       
2
       
-
       
, libxslt, intltool, makeWrapper, systemd, xorg }:

     

       
2
       
2
       
+
       
, libxslt, intltool, makeWrapper, systemd, xorg, epoxy }:

     

       
3
       
3
       
 
       


     

       
4
       
4
       
 
       
stdenv.mkDerivation rec {

     

       
5
       
5
       
 
       
  inherit (import ./src.nix fetchurl) name src;

     
···

       
9
       
9
       
 
       
  buildInputs = with gnome3;

     

       
10
       
10
       
 
       
    [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt

     

       
11
       
11
       
 
       
      gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme

     

       
12
       
12
       
-
       
      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];

     

       
12
       
12
       
+
       
      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd

     

       
13
       
13
       
+
       
      epoxy

     

       
14
       
14
       
+
       
    ];

     

       
13
       
15
       
 
       


     

       
14
       
16
       
 
       
  # FIXME: glib binaries shouldn't be in .dev!

     

       
15
       
17
       
 
       
  preFixup = ''

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-session-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-session/3.22/gnome-session-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "ec5c5e133c8ff1c044802eb887f4911183c45ca2d9de4ce29c6f10768ddc8e42";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-settings-daemon-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-settings-daemon/3.22/gnome-settings-daemon-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "430e42c4f2cc4cb72b669a44c744343f1592ec00d26d2168745a878afe73f82b";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
-
       
# Autogenerated by maintainers/scripts/gnome.sh update

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
fetchurl: {

     

       
4
       
4
       
-
       
  name = "gnome-shell-extensions-3.22.0";

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
  src = fetchurl {

     

       
7
       
7
       
-
       
    url = mirror://gnome/sources/gnome-shell-extensions/3.22/gnome-shell-extensions-3.22.0.tar.xz;

     

       
8
       
8
       
-
       
    sha256 = "317b35f6f1299d5162e693d39b21031f5fe875083c4020217db3ec056e245fc5";

     

       
9
       
9
       
-
       
  };

     

       
10
       
10
       
-
       
}

     

···

       
1
       
1
       
 
       
{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret

     

       
2
       
2
       
 
       
, python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core

     

       
3
       
3
       
 
       
, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip

     

       
4
       
4
       
-
       
, sqlite, libgweather, libcanberra_gtk3

     

       
4
       
4
       
+
       
, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2

     

       
5
       
5
       
 
       
, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper

     

       
6
       
6
       
-
       
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:

     

       
6
       
6
       
+
       
, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }:

     

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
let

     

       
11
       
11
       
 
       
  pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );

     

       
12
       
12
       
+
       


     

       
12
       
13
       
 
       
in stdenv.mkDerivation rec {

     

       
13
       
14
       
 
       
  inherit (import ./src.nix fetchurl) name src;

     

       
14
       
15
       
 
       


     
···

       
17
       
18
       
 
       


     

       
18
       
19
       
 
       
  buildInputs = with gnome3;

     

       
19
       
20
       
 
       
    [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice

     

       
20
       
20
       
-
       
      libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf librsvg

     

       
21
       
21
       
+
       
      libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf

     

       
22
       
22
       
+
       
      (librsvg.override { enableIntrospection = true; })

     

       
21
       
23
       
 
       
      clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns

     

       
22
       
24
       
 
       
      libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server

     

       
23
       
25
       
 
       
      libical libtool nss gtk gstreamer makeWrapper gdm

     

       
24
       
24
       
-
       
      libcanberra_gtk3 gnome_control_center

     

       
26
       
26
       
+
       
      libcanberra_gtk3 gnome_control_center geoclue2

     

       
25
       
27
       
 
       
      defaultIconTheme sqlite gnome3.gnome-bluetooth

     

       
26
       
28
       
 
       
      libgweather # not declared at build time, but typelib is needed at runtime

     

       
27
       
29
       
 
       
      gnome3.gnome-clocks # schemas needed

     

       
28
       
30
       
 
       
      at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon

     

       
29
       
29
       
-
       
      pythonEnv gobjectIntrospection (stdenv.lib.getLib dconf) ];

     

       
31
       
31
       
+
       
      gobjectIntrospection (stdenv.lib.getLib dconf) ];

     

       
30
       
32
       
 
       


     

       
31
       
33
       
 
       
  installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];

     

       
32
       
34
       
 
       


     

       
33
       
35
       
 
       
  preBuild = ''

     

       
34
       
36
       
 
       
    patchShebangs src/data-to-c.pl

     

       
35
       
37
       
 
       
    substituteInPlace data/Makefile --replace " install-keysDATA" ""

     

       
38
       
38
       
+
       


     

       
39
       
39
       
+
       
    substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"

     

       
40
       
40
       
+
       
    substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"

     

       
36
       
41
       
 
       
  '';

     

       
37
       
42
       
 
       


     

       
43
       
43
       
+
       


     

       
38
       
44
       
 
       
  preFixup = with gnome3; ''

     

       
39
       
45
       
 
       
    wrapProgram "$out/bin/gnome-shell" \

     

       
40
       
46
       
 
       
      --prefix PATH : "${unzip}/bin" \

     
···

       
43
       
49
       
 
       
      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \

     

       
44
       
50
       
 
       
      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \

     

       
45
       
51
       
 
       
      --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

     

       
52
       
52
       
+
       


     

       
53
       
53
       
+
       
    wrapProgram "$out/bin/gnome-shell-extension-prefs" \

     

       
54
       
54
       
+
       
      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"

     

       
46
       
55
       
 
       


     

       
47
       
56
       
 
       
    wrapProgram "$out/libexec/gnome-shell-calendar-server" \

     

       
48
       
57
       
 
       
      --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \