lol

Merge #29392: gnome3: 3.24 -> 3.26

It might be slightly confusing that a couple of the changes will be twice
in the history, but let's merge this way.

+862 -751
+1
nixos/modules/module-list.nix
··· 210 210 ./services/desktops/gnome3/seahorse.nix 211 211 ./services/desktops/gnome3/sushi.nix 212 212 ./services/desktops/gnome3/tracker.nix 213 + ./services/desktops/gnome3/tracker-miners.nix 213 214 ./services/desktops/profile-sync-daemon.nix 214 215 ./services/desktops/telepathy.nix 215 216 ./services/development/hoogle.nix
+41
nixos/modules/services/desktops/gnome3/tracker-miners.nix
··· 1 + # Tracker Miners daemons. 2 + 3 + { config, pkgs, lib, ... }: 4 + 5 + with lib; 6 + 7 + { 8 + 9 + ###### interface 10 + 11 + options = { 12 + 13 + services.gnome3.tracker-miners = { 14 + 15 + enable = mkOption { 16 + type = types.bool; 17 + default = false; 18 + description = '' 19 + Whether to enable Tracker miners, indexing services for Tracker 20 + search engine and metadata storage system. 21 + ''; 22 + }; 23 + 24 + }; 25 + 26 + }; 27 + 28 + 29 + ###### implementation 30 + 31 + config = mkIf config.services.gnome3.tracker-miners.enable { 32 + 33 + environment.systemPackages = [ pkgs.gnome3.tracker-miners ]; 34 + 35 + services.dbus.packages = [ pkgs.gnome3.tracker-miners ]; 36 + 37 + systemd.packages = [ pkgs.gnome3.tracker-miners ]; 38 + 39 + }; 40 + 41 + }
+1
nixos/modules/services/x11/desktop-managers/gnome3.nix
··· 108 108 services.gnome3.seahorse.enable = mkDefault true; 109 109 services.gnome3.sushi.enable = mkDefault true; 110 110 services.gnome3.tracker.enable = mkDefault true; 111 + services.gnome3.tracker-miners.enable = mkDefault true; 111 112 hardware.pulseaudio.enable = mkDefault true; 112 113 services.telepathy.enable = mkDefault true; 113 114 networking.networkmanager.enable = mkDefault true;
+6 -5
pkgs/applications/misc/deepin-terminal/default.nix
··· 1 - { stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, gee, wnck, gettext, libsecret, json_glib }: 1 + { stdenv, unzip, fetchFromGitHub, pkgconfig, gtk3, vala, cmake, vte, libgee, wnck, gettext, libsecret, json_glib }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "deepin-terminal-${version}"; 5 - version = "2.3.3"; 5 + version = "2.6.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "linuxdeepin"; 9 9 repo = "deepin-terminal"; 10 10 rev = version; 11 - sha256 = "0qam34g1rannv8kvw1zbps763a9ii9vbrkxyxxdk737hlpxdzg8h"; 11 + sha256 = "11lylkrv69k2jvwparnxymr7z3x9cs82q9p0lr2wrfr48hnfwp8b"; 12 12 }; 13 13 14 14 patchPhase = '' 15 15 substituteInPlace project_path.c --replace __FILE__ \"$out/share/deepin-terminal/\" 16 16 ''; 17 - nativeBuildInputs = [ pkgconfig ]; 18 - buildInputs = [ unzip gtk3 vala cmake vte gee wnck gettext libsecret json_glib ]; 17 + 18 + nativeBuildInputs = [ pkgconfig vala cmake gettext unzip ]; 19 + buildInputs = [ gtk3 vte libgee wnck libsecret json_glib ]; 19 20 20 21 meta = { 21 22 description = "The default terminal emulation for Deepin";
+19 -13
pkgs/desktops/gnome-3/apps/bijiben/default.nix
··· 1 - { stdenv, intltool, fetchurl, pkgconfig, glib 1 + { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, glib 2 2 , evolution_data_server, evolution, sqlite 3 - , makeWrapper, itstool, desktop_file_utils 3 + , wrapGAppsHook, itstool, desktop_file_utils 4 4 , clutter_gtk, libuuid, webkitgtk, zeitgeist 5 5 , gnome3, librsvg, gdk_pixbuf, libxml2 }: 6 6 ··· 8 8 inherit (import ./src.nix fetchurl) name src; 9 9 10 10 doCheck = true; 11 + checkPhase = "meson test"; 12 + 13 + patches = [ 14 + ./no-update-icon-cache.patch 15 + ]; 16 + 17 + postPatch = '' 18 + chmod +x meson_post_install.py 19 + patchShebangs meson_post_install.py 20 + ''; 11 21 12 22 propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 13 23 14 - nativeBuildInputs = [ pkgconfig ]; 15 - buildInputs = [ glib intltool itstool libxml2 16 - clutter_gtk libuuid webkitgtk gnome3.tracker 17 - gnome3.gnome_online_accounts zeitgeist desktop_file_utils 18 - gnome3.gsettings_desktop_schemas makeWrapper 24 + nativeBuildInputs = [ 25 + meson ninja pkgconfig gettext itstool libxml2 desktop_file_utils wrapGAppsHook 26 + ]; 27 + buildInputs = [ glib clutter_gtk libuuid webkitgtk gnome3.tracker 28 + gnome3.gnome_online_accounts zeitgeist 29 + gnome3.gsettings_desktop_schemas 19 30 gdk_pixbuf gnome3.defaultIconTheme librsvg 20 31 evolution_data_server evolution sqlite ]; 21 32 22 33 enableParallelBuilding = true; 23 34 24 - preFixup = '' 25 - wrapProgram "$out/bin/bijiben" \ 26 - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ 27 - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" 28 - ''; 29 - 30 35 meta = with stdenv.lib; { 31 36 homepage = https://wiki.gnome.org/Apps/Bijiben; 32 37 description = "Note editor designed to remain simple to use"; 38 + broken = true; 33 39 maintainers = gnome3.maintainers; 34 40 license = licenses.gpl3; 35 41 platforms = platforms.linux;
+22
pkgs/desktops/gnome-3/apps/bijiben/no-update-icon-cache.patch
··· 1 + --- a/meson_post_install.py 2 + +++ b/meson_post_install.py 3 + @@ -7,10 +7,6 @@ 4 + if not os.environ.get('DESTDIR'): 5 + datadir = sys.argv[1] 6 + 7 + - icondir = os.path.join(datadir, 'icons', 'hicolor') 8 + - print('Update icon cache...') 9 + - subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir]) 10 + - 11 + schemadir = os.path.join(datadir, 'glib-2.0', 'schemas') 12 + print('Compile gsettings schemas...') 13 + subprocess.call(['glib-compile-schemas', schemadir]) 14 + @@ -18,8 +14,3 @@ 15 + desktop_file = os.path.join(datadir, 'applications', 'org.gnome.bijiben.desktop') 16 + print('Validate desktop file...') 17 + subprocess.call(['desktop-file-validate', desktop_file]) 18 + - 19 + - if sys.argv[2] == 'update-mimedb': 20 + - mimedir = os.path.join(datadir, 'mime') 21 + - print('Update mime database...') 22 + - subprocess.call(['update-mime-database', mimedir])
+3 -3
pkgs/desktops/gnome-3/apps/bijiben/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "bijiben-3.24.1"; 4 + name = "bijiben-3.27.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/bijiben/3.24/bijiben-3.24.1.tar.xz; 8 - sha256 = "2602fc3f8ce5c39813b4273ceed7bdb014b1cf1fa82a6757fc25e5078be4f741"; 7 + url = mirror://gnome/sources/bijiben/3.27/bijiben-3.27.1.tar.xz; 8 + sha256 = "7b4623467f3cb745c4b268d6fb2d9da32cbc96ffb5b1bbf2a153b692e295ac64"; 9 9 }; 10 10 }
-2
pkgs/desktops/gnome-3/apps/cheese/default.nix
··· 15 15 16 16 enableParallelBuilding = true; 17 17 18 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; 19 - 20 18 meta = with stdenv.lib; { 21 19 homepage = https://wiki.gnome.org/Apps/Cheese; 22 20 description = "Take photos and videos with your webcam, with fun graphical effects";
+3 -3
pkgs/desktops/gnome-3/apps/cheese/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "cheese-3.24.0"; 4 + name = "cheese-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/cheese/3.24/cheese-3.24.0.tar.xz; 8 - sha256 = "26d0324c11d858a53a8a78f60babda63310a2b6f46c8fa3a4f6aa36ca9d0f372"; 7 + url = mirror://gnome/sources/cheese/3.26/cheese-3.26.0.tar.xz; 8 + sha256 = "8ef52fc41de1817c4e4274e23eb7c29d28b64ae0f0d1fec52e184e99aea6c605"; 9 9 }; 10 10 }
+5 -10
pkgs/desktops/gnome-3/apps/evolution/default.nix
··· 1 - { stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight 1 + { stdenv, cmake, intltool, fetchurl, libxml2, webkitgtk, highlight 2 2 , pkgconfig, gtk3, glib, libnotify, gtkspell3 3 3 , wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite 4 - , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool 5 - , libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap 6 - , cmake}: 4 + , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu 5 + , libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap }: 7 6 8 7 let 9 8 majVer = gnome3.version; ··· 15 14 propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard 16 15 gnome3.evolution_data_server ]; 17 16 18 - propagatedBuildInputs = [ gnome3.gtkhtml ]; 19 - 20 - buildInputs = [ gtk3 glib intltool itstool libxml2 libtool 21 - gdk_pixbuf gnome3.defaultIconTheme librsvg db icu 17 + buildInputs = [ gtk3 glib gdk_pixbuf gnome3.defaultIconTheme librsvg db icu 22 18 gnome3.evolution_data_server libsecret libical gcr 23 19 webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3 24 20 libcanberra_gtk3 bogofilter gnome3.libgdata sqlite ··· 26 22 nss nspr libnotify procps highlight gnome3.libgweather 27 23 gnome3.gsettings_desktop_schemas 28 24 gnome3.libgnome_keyring gnome3.glib_networking openldap 29 - cmake 30 25 ]; 31 26 32 - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; 27 + nativeBuildInputs = [ cmake intltool itstool libxml2 pkgconfig wrapGAppsHook ]; 33 28 34 29 35 30 configureFlags = [ "--disable-pst-import" "--disable-autoar"
+3 -3
pkgs/desktops/gnome-3/apps/evolution/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "evolution-3.24.5"; 4 + name = "evolution-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/evolution/3.24/evolution-3.24.5.tar.xz; 8 - sha256 = "5544c5ea1a1c352e0300bff447ddf67146486fc3a6bbecd1b785d378d34b2189"; 7 + url = mirror://gnome/sources/evolution/3.26/evolution-3.26.2.tar.xz; 8 + sha256 = "2d9299b8414903021faa03cbb885814de454f5260398eb2c2a03600224479137"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/apps/file-roller/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "file-roller-3.24.1"; 4 + name = "file-roller-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz; 8 - sha256 = "011545e8bd81a415fb068718347bf63ced4ab176210ce36a668904a3124c7f3a"; 7 + url = mirror://gnome/sources/file-roller/3.26/file-roller-3.26.2.tar.xz; 8 + sha256 = "3e677b8e1c2f19aead69cf4fc419a19fc3373aaf5d7bf558b4f077f10bbba8a5"; 9 9 }; 10 10 }
+5 -5
pkgs/desktops/gnome-3/apps/glade/default.nix
··· 1 1 { stdenv, intltool, fetchurl, python, autoreconfHook 2 - , pkgconfig, gtk3, glib 3 - , makeWrapper, itstool, libxml2, docbook_xsl 4 - , gnome3, librsvg, gdk_pixbuf, libxslt }: 2 + , pkgconfig, gtk3, glib, gobjectIntrospection 3 + , wrapGAppsHook, itstool, libxml2, docbook_xsl 4 + , gnome3, gdk_pixbuf, libxslt }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 inherit (import ./src.nix fetchurl) name src; ··· 9 9 propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 10 10 11 11 nativeBuildInputs = [ 12 - pkgconfig intltool itstool makeWrapper docbook_xsl libxslt 12 + pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobjectIntrospection 13 13 # reconfiguration 14 14 autoreconfHook gnome3.gnome_common gnome3.yelp_tools 15 15 ]; 16 16 buildInputs = [ gtk3 glib libxml2 python 17 17 gnome3.gsettings_desktop_schemas 18 - gdk_pixbuf gnome3.defaultIconTheme librsvg ]; 18 + gdk_pixbuf gnome3.defaultIconTheme ]; 19 19 20 20 enableParallelBuilding = true; 21 21
+5 -5
pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
··· 1 - { stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib 1 + { stdenv, fetchurl, makeWrapper, pkgconfig, gettext, itstool, libvirt-glib 2 2 , glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk 3 - , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala_0_32 3 + , spice_protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala 4 4 , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop_file_utils 5 5 , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret 6 6 , libcap_ng, numactl, xen, libapparmor ··· 16 16 doCheck = true; 17 17 18 18 nativeBuildInputs = [ 19 - makeWrapper pkgconfig intltool 19 + makeWrapper pkgconfig gettext 20 20 ]; 21 21 22 22 buildInputs = [ 23 23 itstool libvirt-glib glib gobjectIntrospection libxml2 gtk3 gtkvnc 24 - libvirt spice_gtk spice_protocol libuuid libsoup libosinfo systemd 25 - tracker vala_0_32 libcap yajl gmp gdbm cyrus_sasl libusb libarchive 24 + libvirt spice_gtk spice_protocol libsoup libosinfo systemd 25 + tracker tracker-miners vala libcap yajl gmp gdbm cyrus_sasl libusb libarchive 26 26 gnome3.defaultIconTheme librsvg desktop_file_utils acl libgudev libsecret 27 27 libcap_ng numactl xen libapparmor 28 28 ];
+3 -3
pkgs/desktops/gnome-3/apps/gnome-boxes/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-boxes-3.24.0"; 4 + name = "gnome-boxes-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.0.tar.xz; 8 - sha256 = "7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49"; 7 + url = mirror://gnome/sources/gnome-boxes/3.26/gnome-boxes-3.26.2.tar.xz; 8 + sha256 = "d00fc083182963dc1bbdee5e743ceb28ba03fbf5a9ea87c78d29dca5fb5b9210"; 9 9 }; 10 10 }
+10 -6
pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook 2 - , intltool, evolution_data_server, sqlite, libxml2, libsoup 1 + { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook 2 + , gettext, libxml2, gnome3, gtk, evolution_data_server, libsoup 3 3 , glib, gnome_online_accounts, gsettings_desktop_schemas }: 4 4 5 5 stdenv.mkDerivation rec { ··· 7 7 8 8 NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; 9 9 10 - nativeBuildInputs = [ pkgconfig ]; 10 + nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook ]; 11 11 buildInputs = [ 12 - gtk3 wrapGAppsHook intltool evolution_data_server 13 - sqlite libxml2 libsoup glib gnome3.defaultIconTheme gnome_online_accounts 14 - gsettings_desktop_schemas 12 + gtk evolution_data_server libsoup glib gnome_online_accounts 13 + gsettings_desktop_schemas gnome3.defaultIconTheme 15 14 ]; 15 + 16 + postPatch = '' 17 + chmod +x meson_post_install.py # patchShebangs requires executable file 18 + patchShebangs meson_post_install.py 19 + ''; 16 20 17 21 meta = with stdenv.lib; { 18 22 homepage = https://wiki.gnome.org/Apps/Calendar;
+3 -3
pkgs/desktops/gnome-3/apps/gnome-calendar/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-calendar-3.24.3"; 4 + name = "gnome-calendar-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.3.tar.xz; 8 - sha256 = "3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec"; 7 + url = mirror://gnome/sources/gnome-calendar/3.26/gnome-calendar-3.26.2.tar.xz; 8 + sha256 = "19a2c737b9662be926fb68e7dc731d94c523d23fa7a49e435e6a0346770dc50e"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/apps/gnome-characters/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-characters-3.24.0"; 4 + name = "gnome-characters-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-characters/3.24/gnome-characters-3.24.0.tar.xz; 8 - sha256 = "9ef4ff28437a63a221c47189231909fb9e4cac838c5f3cf402906fb128b52596"; 7 + url = mirror://gnome/sources/gnome-characters/3.26/gnome-characters-3.26.2.tar.xz; 8 + sha256 = "69d0218b4ce16451bef0e6ee9f9f18f5b7851aa3a758b13315d592b077374f7b"; 9 9 }; 10 10 }
+13 -10
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
··· 1 - { stdenv, intltool, fetchurl, libgweather, libnotify 2 - , pkgconfig, gtk3, glib, gsound 3 - , makeWrapper, itstool, libcanberra_gtk3, libtool 4 - , gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }: 1 + { stdenv, fetchurl 2 + , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop_file_utils 3 + , vala, gtk3, glib, gsound, libcanberra_gtk3 4 + , gnome3, gdk_pixbuf, geoclue2, libgweather }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 inherit (import ./src.nix fetchurl) name src; 8 8 9 9 doCheck = true; 10 10 11 - nativeBuildInputs = [ pkgconfig ]; 12 - buildInputs = [ gtk3 glib intltool itstool libcanberra_gtk3 13 - gnome3.gsettings_desktop_schemas makeWrapper 14 - gdk_pixbuf gnome3.defaultIconTheme librsvg 11 + nativeBuildInputs = [ vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop_file_utils ]; 12 + buildInputs = [ gtk3 glib libcanberra_gtk3 13 + gnome3.gsettings_desktop_schemas 14 + gdk_pixbuf gnome3.defaultIconTheme 15 15 gnome3.gnome_desktop gnome3.geocode_glib geoclue2 16 - libgweather libnotify libtool gsound 17 - wrapGAppsHook ]; 16 + libgweather gsound ]; 18 17 19 18 enableParallelBuilding = true; 19 + 20 + prePatch = "patchShebangs build-aux/"; 21 + 22 + checkPhase = "meson test"; 20 23 21 24 meta = with stdenv.lib; { 22 25 homepage = https://wiki.gnome.org/Apps/Clocks;
+3 -3
pkgs/desktops/gnome-3/apps/gnome-clocks/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-clocks-3.24.0"; 4 + name = "gnome-clocks-3.26.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-3.24.0.tar.xz; 8 - sha256 = "9d5ae0e972ad92d0a0873af9e0f9b00b8378b3cd50b7830e6fb9a227c6107f36"; 7 + url = mirror://gnome/sources/gnome-clocks/3.26/gnome-clocks-3.26.1.tar.xz; 8 + sha256 = "2bd8d8df1d6aa0feddd4afc15d84b1308202fda59a3c3be42e3bce7e9ccd11f7"; 9 9 }; 10 10 }
+8 -11
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
··· 1 - { stdenv, intltool, fetchurl, evince, gjs 2 - , pkgconfig, gtk3, glib 3 - , makeWrapper, itstool, libxslt, webkitgtk 1 + { stdenv, gettext, fetchurl, evince, gjs 2 + , pkgconfig, gtk3, glib, tracker, tracker-miners 3 + , itstool, libxslt, webkitgtk 4 4 , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl 5 5 , gobjectIntrospection, json_glib, inkscape, poppler_utils 6 6 , gmp, desktop_file_utils, wrapGAppsHook }: ··· 12 12 13 13 configureFlags = [ "--enable-getting-started" ]; 14 14 15 - nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ gtk3 glib intltool itstool libxslt 17 - docbook_xsl desktop_file_utils inkscape poppler_utils 18 - gnome3.gsettings_desktop_schemas makeWrapper gmp 15 + nativeBuildInputs = [ pkgconfig gettext itstool libxslt desktop_file_utils docbook_xsl wrapGAppsHook ]; 16 + buildInputs = [ gtk3 glib inkscape poppler_utils 17 + gnome3.gsettings_desktop_schemas gmp 19 18 gdk_pixbuf gnome3.defaultIconTheme librsvg evince 20 19 libsoup webkitgtk gjs gobjectIntrospection gnome3.rest 21 - gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts 22 - gnome3.gnome_desktop gnome3.libzapojit json_glib 23 - wrapGAppsHook ] 24 - ++ (with gnome3; [ libgepub ]); 20 + tracker tracker-miners gnome3.libgdata gnome3.gnome_online_accounts 21 + gnome3.gnome_desktop gnome3.libzapojit json_glib gnome3.libgepub ]; 25 22 26 23 enableParallelBuilding = true; 27 24
+3 -3
pkgs/desktops/gnome-3/apps/gnome-documents/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-documents-3.24.3"; 4 + name = "gnome-documents-3.26.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz; 8 - sha256 = "c2f920fe1696499ba2594c9ab3328e7f18fa8f60df0273aaad503bbe27eeb9a0"; 7 + url = mirror://gnome/sources/gnome-documents/3.26/gnome-documents-3.26.1.tar.xz; 8 + sha256 = "ba0d3084359d666b90733bb43206d24190fa85304bfe45f674ab6e6a27cb7fc9"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-getting-started-docs-3.24.1"; 4 + name = "gnome-getting-started-docs-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-3.24.1.tar.xz; 8 - sha256 = "9e62895362597cf563696852294a4838cea7243f0116767c254c870b7ba94a97"; 7 + url = mirror://gnome/sources/gnome-getting-started-docs/3.26/gnome-getting-started-docs-3.26.2.tar.xz; 8 + sha256 = "34f45f6b5759a46547e834f1b706ae7485fd94e1af5354154420d8910ec67775"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/apps/gnome-logs/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-logs-3.24.2"; 4 + name = "gnome-logs-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.2.tar.xz; 8 - sha256 = "9aaf0d6ba6af195dc9805b5f6d290b454a0b710daf0c595fe6286f59a43083c4"; 7 + url = mirror://gnome/sources/gnome-logs/3.26/gnome-logs-3.26.2.tar.xz; 8 + sha256 = "e17ca011e7bea756bd841e027e56cfe8c214bed4817cb35732ace4aa73ff8f5c"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/apps/gnome-maps/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-maps-3.24.3"; 4 + name = "gnome-maps-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-maps/3.24/gnome-maps-3.24.3.tar.xz; 8 - sha256 = "5ef3ec36aa76eb9a49a15ee61539bea7b59e8aa0a802483df6cedcc65566d0d6"; 7 + url = mirror://gnome/sources/gnome-maps/3.26/gnome-maps-3.26.2.tar.xz; 8 + sha256 = "031d5c4a1aa79f1fbaf87f01fb790f7aab1d8dcd5d061cb5daf0fa96eaa18050"; 9 9 }; 10 10 }
+2 -2
pkgs/desktops/gnome-3/apps/gnome-music/default.nix
··· 1 - { stdenv, intltool, fetchurl, gdk_pixbuf, tracker 1 + { stdenv, intltool, fetchurl, gdk_pixbuf, tracker, tracker-miners 2 2 , libxml2, python3Packages, libnotify, wrapGAppsHook 3 3 , pkgconfig, gtk3, glib, cairo 4 4 , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: ··· 15 15 python3Packages.pycairo python3Packages.dbus-python python3Packages.requests 16 16 python3Packages.pygobject3 gst_all_1.gstreamer gst_all_1.gst-plugins-base 17 17 gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad wrapGAppsHook 18 - gnome3.gsettings_desktop_schemas makeWrapper tracker ]; 18 + gnome3.gsettings_desktop_schemas makeWrapper tracker tracker-miners ]; 19 19 20 20 wrapPrefixVariables = [ "PYTHONPATH" ]; 21 21
+3 -3
pkgs/desktops/gnome-3/apps/gnome-music/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-music-3.24.2"; 4 + name = "gnome-music-3.26.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-music/3.24/gnome-music-3.24.2.tar.xz; 8 - sha256 = "1a72b7972cac66c7aba7a4fbcbf8df99b3df7c46f26957b3e16089550d3ef62c"; 7 + url = mirror://gnome/sources/gnome-music/3.26/gnome-music-3.26.1.tar.xz; 8 + sha256 = "7197dff12f441a52b4011512bfe8ec926f2ce4ca511f79b078e0e612d612f8c3"; 9 9 }; 10 10 }
+2 -2
pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
··· 1 1 { stdenv, intltool, fetchurl, exempi, libxml2 2 - , pkgconfig, gtk3, glib 2 + , pkgconfig, gtk3, glib, tracker, tracker-miners 3 3 , makeWrapper, itstool, gegl, babl, lcms2 4 4 , desktop_file_utils, gmp, libmediaart, wrapGAppsHook 5 5 , gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib ··· 18 18 gdk_pixbuf gnome3.defaultIconTheme librsvg exempi 19 19 gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo 20 20 gnome3.gnome_online_accounts gnome3.gnome_desktop 21 - lcms2 libexif gnome3.tracker libxml2 desktop_file_utils 21 + lcms2 libexif tracker tracker-miners libxml2 desktop_file_utils 22 22 wrapGAppsHook gexiv2 geocode_glib dleyna-renderer ]; 23 23 24 24 enableParallelBuilding = true;
+3 -3
pkgs/desktops/gnome-3/apps/gnome-photos/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-photos-3.24.3"; 4 + name = "gnome-photos-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.3.tar.xz; 8 - sha256 = "cd365629ce584d223c023676a88b6194012bbc561c4a4b1c8eca462425e76288"; 7 + url = mirror://gnome/sources/gnome-photos/3.26/gnome-photos-3.26.2.tar.xz; 8 + sha256 = "9001ed2794da44522a1d700c7b5aff40ede92f80ba17031f0dfa7f54d6d05657"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/apps/gnome-weather/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-weather-3.24.0"; 4 + name = "gnome-weather-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-weather/3.24/gnome-weather-3.24.0.tar.xz; 8 - sha256 = "e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574"; 7 + url = mirror://gnome/sources/gnome-weather/3.26/gnome-weather-3.26.0.tar.xz; 8 + sha256 = "965cc0d1b4d4e53c06d494db96f0b124d232af5c0e731ca900edd10f77a74c78"; 9 9 }; 10 10 }
+14 -6
pkgs/desktops/gnome-3/apps/polari/default.nix
··· 1 - { stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme 2 - , telepathy_glib, gjs, itstool, telepathy_idle, libxml2 3 - , pkgconfig, gtk3, glib, librsvg, libsecret, libsoup 1 + { stdenv, itstool, fetchurl, fetchpatch, gdk_pixbuf, adwaita-icon-theme 2 + , telepathy_glib, gjs, meson, ninja, gettext, telepathy_idle, libxml2, desktop_file_utils 3 + , pkgconfig, gtk3, glib, libsecret, libsoup, gobjectIntrospection, appstream-glib 4 4 , gnome3, wrapGAppsHook, telepathy_logger, gspell }: 5 5 6 6 stdenv.mkDerivation rec { ··· 8 8 9 9 propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ]; 10 10 11 - nativeBuildInputs = [ pkgconfig ]; 12 - buildInputs = [ gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas 13 - telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ]; 11 + nativeBuildInputs = [ meson ninja pkgconfig itstool gettext wrapGAppsHook libxml2 12 + desktop_file_utils gobjectIntrospection appstream-glib ]; 13 + buildInputs = [ gtk3 glib adwaita-icon-theme gnome3.gsettings_desktop_schemas 14 + telepathy_glib telepathy_logger gjs gspell gdk_pixbuf libsecret libsoup ]; 15 + 16 + patches = [ 17 + (fetchpatch { 18 + url = https://gitlab.gnome.org/jtojnar/polari/commit/a6733a6ad95eac1813e7b18e3d0018a22ee7a377.diff; 19 + sha256 = "0f5ll49h5w0477lkh67kaa2j83z376z1jk7z3i2v7cq4d3hi5lf9"; 20 + }) 21 + ]; 14 22 15 23 enableParallelBuilding = true; 16 24
+3 -3
pkgs/desktops/gnome-3/apps/polari/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "polari-3.24.2"; 4 + name = "polari-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/polari/3.24/polari-3.24.2.tar.xz; 8 - sha256 = "3e1884000fda5cf6293e21ca1c028ec0b13d5baab5a79b8c11e4728c3238bb42"; 7 + url = mirror://gnome/sources/polari/3.26/polari-3.26.2.tar.xz; 8 + sha256 = "2f36361dacf5d924d134f231fdb36ec4539f7495fce325d9b2f2728bd17cc190"; 9 9 }; 10 10 }
+2 -2
pkgs/desktops/gnome-3/apps/seahorse/default.nix
··· 1 - { stdenv, intltool, fetchurl, vala_0_32 1 + { stdenv, intltool, fetchurl, vala 2 2 , pkgconfig, gtk3, glib 3 3 , wrapGAppsHook, itstool, gnupg, libsoup 4 4 , gnome3, librsvg, gdk_pixbuf, gpgme ··· 17 17 buildInputs = [ gtk3 glib intltool itstool gnome3.gcr 18 18 gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg 19 19 gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme 20 - libsecret avahi libsoup p11_kit vala_0_32 20 + libsecret avahi libsoup p11_kit vala 21 21 openssh ]; 22 22 23 23 preFixup = ''
+3 -3
pkgs/desktops/gnome-3/core/adwaita-icon-theme/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "adwaita-icon-theme-3.24.0"; 4 + name = "adwaita-icon-theme-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz; 8 - sha256 = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a"; 7 + url = mirror://gnome/sources/adwaita-icon-theme/3.26/adwaita-icon-theme-3.26.0.tar.xz; 8 + sha256 = "9cad85de19313f5885497aceab0acbb3f08c60fcd5fa5610aeafff37a1d12212"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/baobab/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "baobab-3.24.0"; 4 + name = "baobab-3.26.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/baobab/3.24/baobab-3.24.0.tar.xz; 8 - sha256 = "5980e96df9f3d1751a969869ec07bc184ae3ad667d5a3eb06cf1297091fdfc3f"; 7 + url = mirror://gnome/sources/baobab/3.26/baobab-3.26.1.tar.xz; 8 + sha256 = "7a59ab5945f5d90725231b10d85a1893403f56660b1627c111d2b4eeb1ef787e"; 9 9 }; 10 10 }
+7 -5
pkgs/desktops/gnome-3/core/caribou/default.nix
··· 1 - { fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2 2 - , libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook }: 1 + { fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2 2 + , libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, autoreconfHook 3 + , wrapGAppsHook }: 3 4 4 5 let 5 6 majorVersion = "0.4"; 7 + pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); 6 8 in 7 9 stdenv.mkDerivation rec { 8 10 name = "caribou-${majorVersion}.21"; ··· 12 14 sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; 13 15 }; 14 16 15 - nativeBuildInputs = [ pkgconfig autoreconfHook ]; 17 + nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; 16 18 17 19 buildInputs = with gnome3; 18 - [ glib gtk clutter at_spi2_core dbus pythonPackages.python 19 - pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ]; 20 + [ glib gtk clutter at_spi2_core dbus pythonEnv python3Packages.pygobject3 21 + libXtst gtk2 ]; 20 22 21 23 propagatedBuildInputs = [ gnome3.libgee libxklavier ]; 22 24
+2 -2
pkgs/desktops/gnome-3/core/dconf-editor/default.nix
··· 1 - { stdenv, fetchurl, vala_0_32, libxslt, pkgconfig, glib, dbus_glib, gnome3 1 + { stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3 2 2 , libxml2, intltool, docbook_xsl_ns, docbook_xsl, wrapGAppsHook }: 3 3 4 4 stdenv.mkDerivation rec { ··· 6 6 7 7 nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; 8 8 9 - buildInputs = [ vala_0_32 libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme 9 + buildInputs = [ vala libxslt glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme 10 10 gnome3.gsettings_desktop_schemas 11 11 intltool docbook_xsl docbook_xsl_ns gnome3.dconf ]; 12 12
+3 -3
pkgs/desktops/gnome-3/core/dconf-editor/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "dconf-editor-3.22.0"; 4 + name = "dconf-editor-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/dconf-editor/3.22/dconf-editor-3.22.0.tar.xz; 8 - sha256 = "4ca3c2c3836f4c944f161540d1521507dab8e7bee0cac7d543560808efb9246f"; 7 + url = mirror://gnome/sources/dconf-editor/3.26/dconf-editor-3.26.2.tar.xz; 8 + sha256 = "28b453fe49c49d7dfaf07c85c01d7495913f93ab64a0b223c117eb17d1cb8ad1"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/eog/default.nix
··· 1 - { fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3 1 + { fetchurl, stdenv, gettext, pkgconfig, itstool, libxml2, libjpeg, gnome3 2 2 , shared_mime_info, wrapGAppsHook, librsvg, libexif }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 inherit (import ./src.nix fetchurl) name src; 6 6 7 - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; 7 + nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; 8 8 9 9 buildInputs = with gnome3; 10 - [ intltool itstool libxml2 libjpeg gtk glib libpeas librsvg 10 + [ libxml2 libjpeg gtk glib libpeas librsvg 11 11 gsettings_desktop_schemas shared_mime_info adwaita-icon-theme 12 12 gnome_desktop libexif dconf ]; 13 13
+3 -3
pkgs/desktops/gnome-3/core/eog/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "eog-3.24.1"; 4 + name = "eog-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/eog/3.24/eog-3.24.1.tar.xz; 8 - sha256 = "f51ee116e2c159fac1719e003a32e1cb6cbff51914fd1f6409f461a790ff27e7"; 7 + url = mirror://gnome/sources/eog/3.26/eog-3.26.2.tar.xz; 8 + sha256 = "b53e3d4dfa7d0085b829a5fb95f148a099803c00ef276be7685efd5ec38807ad"; 9 9 }; 10 10 }
+22 -14
pkgs/desktops/gnome-3/core/epiphany/default.nix
··· 1 - { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu 2 - , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool 1 + { stdenv, meson, ninja, gettext, fetchurl, pkgconfig, gtk, glib, icu 2 + , wrapGAppsHook, gnome3, libxml2, libxslt, itstool 3 3 , webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit 4 - , sqlite, gcr, avahi, nss, isocodes, itstool, file, which 5 - , gdk_pixbuf, librsvg, gnome_common, gst_all_1, json_glib }: 4 + , sqlite, gcr, isocodes, desktop_file_utils, file 5 + , gdk_pixbuf, gnome_common, gst_all_1, json_glib }: 6 6 7 7 stdenv.mkDerivation rec { 8 8 inherit (import ./src.nix fetchurl) name src; 9 9 10 10 # Tests need an X display 11 - configureFlags = [ "--disable-static --disable-tests" ]; 11 + mesonFlags = [ "-Dunit_tests=false" ]; 12 12 13 13 propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 14 14 15 - nativeBuildInputs = [ pkgconfig file wrapGAppsHook ]; 15 + nativeBuildInputs = [ meson ninja libxslt pkgconfig itstool gettext file wrapGAppsHook desktop_file_utils ]; 16 16 17 - buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt file 18 - webkitgtk libsoup libsecret gnome_desktop libnotify libtool 19 - sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools 20 - gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common 21 - gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf 22 - gnome3.glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base 17 + buildInputs = [ gtk glib webkitgtk libsoup libxml2 libsecret gnome_desktop libnotify 18 + sqlite isocodes p11_kit icu gnome3.yelp_tools 19 + gdk_pixbuf gnome3.defaultIconTheme gnome_common gcr 20 + glib_networking gst_all_1.gstreamer gst_all_1.gst-plugins-base 23 21 gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly 24 22 gst_all_1.gst-libav json_glib ]; 25 23 26 - NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; 24 + enableParallelBuilding = true; 27 25 28 - enableParallelBuilding = true; 26 + postPatch = '' 27 + chmod +x post_install.py # patchShebangs requires executable file 28 + patchShebangs post_install.py 29 + ''; 30 + 31 + postFixup = '' 32 + # Patched meson does not add internal libraries to rpath 33 + for f in bin/.epiphany-wrapped libexec/.epiphany-search-provider-wrapped libexec/epiphany/.ephy-profile-migrator-wrapped lib/epiphany/web-extensions/libephywebextension.so; do 34 + patchelf --set-rpath "$out/lib/epiphany:$(patchelf --print-rpath $out/$f)" "$out/$f" 35 + done 36 + ''; 29 37 30 38 meta = with stdenv.lib; { 31 39 homepage = https://wiki.gnome.org/Apps/Epiphany;
+3 -3
pkgs/desktops/gnome-3/core/epiphany/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "epiphany-3.24.3"; 4 + name = "epiphany-3.26.3"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/epiphany/3.24/epiphany-3.24.3.tar.xz; 8 - sha256 = "fef51676310d9f37e18c9b2d778254232eb17cccd988c2d1ecf42c7b2963a154"; 7 + url = mirror://gnome/sources/epiphany/3.26/epiphany-3.26.3.tar.xz; 8 + sha256 = "cb50042496e704621db3d0213581b0f914c639e160522751f64c5e5f6e6040b5"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/evince/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "evince-3.24.1"; 4 + name = "evince-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/evince/3.24/evince-3.24.1.tar.xz; 8 - sha256 = "9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37"; 7 + url = mirror://gnome/sources/evince/3.26/evince-3.26.0.tar.xz; 8 + sha256 = "79567bdb743cf0c3ed7b638da32afc9b850298f9b4edd532455df4a7e2a4c9d8"; 9 9 }; 10 10 }
+8 -7
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
··· 1 1 { fetchurl, stdenv, pkgconfig, gnome3, python, dconf 2 2 , intltool, libsoup, libxml2, libsecret, icu, sqlite 3 - , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, 4 - vala_0_32, cmake, kerberos, openldap, webkitgtk, libaccounts-glib }: 3 + , p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true 4 + , vala, cmake, kerberos, openldap, webkitgtk, libaccounts-glib, json_glib }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 inherit (import ./src.nix fetchurl) name src; 8 8 9 + nativeBuildInputs = [ cmake pkgconfig intltool python gperf makeWrapper ]; 9 10 buildInputs = with gnome3; 10 - [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts 11 - (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper 12 - icu sqlite gsettings_desktop_schemas cmake kerberos openldap webkitgtk 13 - libaccounts-glib ] 14 - ++ stdenv.lib.optional valaSupport vala_0_32; 11 + [ glib libsoup libxml2 gtk gnome_online_accounts 12 + (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata 13 + icu sqlite gsettings_desktop_schemas kerberos openldap webkitgtk 14 + libaccounts-glib json_glib ] 15 + ++ stdenv.lib.optional valaSupport vala; 15 16 16 17 propagatedBuildInputs = [ libsecret nss nspr libical db ]; 17 18
+3 -3
pkgs/desktops/gnome-3/core/evolution-data-server/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "evolution-data-server-3.24.5"; 4 + name = "evolution-data-server-3.26.2.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.5.tar.xz; 8 - sha256 = "6d8ec04b79c02bb517cc3e23ac3b23c7503465dfa27b7415955201a2f62844e1"; 7 + url = mirror://gnome/sources/evolution-data-server/3.26/evolution-data-server-3.26.2.1.tar.xz; 8 + sha256 = "09fb1c4ce20c62309e8ea2d80649f590492e88c1deb89118e715e155296baefd"; 9 9 }; 10 10 }
+2 -2
pkgs/desktops/gnome-3/core/folks/default.nix
··· 1 1 { fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool 2 - , vala_0_32, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs 2 + , vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs 3 3 , telepathy_glib, evolution_data_server, libsecret, db }: 4 4 5 5 # TODO: enable more folks backends ··· 18 18 propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; 19 19 # dbus_daemon needed for tests 20 20 buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs 21 - vala_0_32 libsecret libxml2 libsoup nspr nss intltool db ]; 21 + vala libsecret libxml2 libsoup nspr nss intltool db ]; 22 22 nativeBuildInputs = [ pkgconfig ]; 23 23 24 24 configureFlags = "--disable-fatal-warnings";
+3 -4
pkgs/desktops/gnome-3/core/gcr/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib 2 2 , libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk 3 - , gobjectIntrospection, makeWrapper, libxslt, vala_0_32, gnome3 }: 3 + , gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 inherit (import ./src.nix fetchurl) name src; 7 7 8 8 outputs = [ "out" "dev" ]; 9 9 10 - nativeBuildInputs = [ pkgconfig ]; 10 + nativeBuildInputs = [ pkgconfig intltool gobjectIntrospection libxslt makeWrapper vala ]; 11 11 12 12 buildInputs = let 13 13 gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome 14 14 in [ 15 - intltool gpg gobjectIntrospection libxslt 16 - libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk makeWrapper vala_0_32 15 + gpg libgcrypt libtasn1 dbus_glib pango gdk_pixbuf atk 17 16 ]; 18 17 19 18 propagatedBuildInputs = [ glib gtk p11_kit ];
+14 -5
pkgs/desktops/gnome-3/core/gdm/default.nix
··· 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 4 - , librsvg }: 4 + , librsvg, coreutils }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 inherit (import ./src.nix fetchurl) name src; ··· 11 11 substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X" 12 12 ''; 13 13 14 + postPatch = '' 15 + substituteInPlace daemon/gdm-manager.c --replace "/bin/plymouth" "${plymouth}/bin/plymouth" 16 + substituteInPlace data/gdm.service.in --replace "/bin/kill" "${coreutils}/bin/kill" 17 + ''; 18 + 14 19 configureFlags = [ "--sysconfdir=/etc" 15 20 "--localstatedir=/var" 16 21 "--with-plymouth=yes" 17 22 "--with-initial-vt=7" 18 23 "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; 19 24 20 - nativeBuildInputs = [ autoreconfHook pkgconfig ]; 21 - buildInputs = [ glib itstool libxml2 intltool 22 - accountsservice gnome3.dconf systemd 25 + nativeBuildInputs = [ pkgconfig libxml2 itstool intltool autoreconfHook libtool gnome3.dconf ]; 26 + buildInputs = [ glib accountsservice systemd 23 27 gobjectIntrospection libX11 gtk 24 - libcanberra_gtk3 pam libtool plymouth librsvg ]; 28 + libcanberra_gtk3 pam plymouth librsvg ]; 25 29 26 30 enableParallelBuilding = true; 27 31 ··· 30 34 ./gdm-x-session_extra_args.patch 31 35 ./gdm-session-worker_xserver-path.patch 32 36 ]; 37 + 38 + postInstall = '' 39 + # Prevent “Could not parse desktop file orca-autostart.desktop or it references a not found TryExec binary” 40 + rm $out/share/gdm/greeter/autostart/orca-autostart.desktop 41 + ''; 33 42 34 43 installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ]; 35 44
-19
pkgs/desktops/gnome-3/core/gdm/gdm-x-session_path.patch
··· 1 - diff --git a/daemon/gdm-x-session.c.orig b/daemon/gdm-x-session.c 2 - index d835b34..86f0d47 100644 3 - --- a/daemon/gdm-x-session.c.orig 4 - +++ b/daemon/gdm-x-session.c 5 - @@ -240,7 +240,13 @@ spawn_x_server (State *state, 6 - 7 - display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO); 8 - 9 - - g_ptr_array_add (arguments, X_SERVER); 10 - + if (g_getenv ("GDM_X_SERVER") != NULL) { 11 - + g_debug ("using GDM_X_SERVER: %s", g_getenv("GDM_X_SERVER")); 12 - + g_ptr_array_add (arguments, g_getenv("GDM_X_SERVER")); 13 - + } else { 14 - + g_debug ("GDM_X_SERVER not set, using default: %s", X_SERVER); 15 - + g_ptr_array_add (arguments, X_SERVER); 16 - + } 17 - 18 - if (vt_string != NULL) { 19 - g_ptr_array_add (arguments, vt_string);
+3 -3
pkgs/desktops/gnome-3/core/gdm/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gdm-3.24.2"; 4 + name = "gdm-3.26.2.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gdm/3.24/gdm-3.24.2.tar.xz; 8 - sha256 = "4378b9fad5536e03c56ad138d0e249fbcaa09977b867895426cb41c978fe5de8"; 7 + url = mirror://gnome/sources/gdm/3.26/gdm-3.26.2.1.tar.xz; 8 + sha256 = "17ddcb00602c2b426de58bb4b0d99af9de27450a8557dcc5ec850c080d55ad57"; 9 9 }; 10 10 }
+2 -7
pkgs/desktops/gnome-3/core/gjs/default.nix
··· 1 1 { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection 2 - , spidermonkey_38, pango, readline, glib, libxml2, dbus }: 2 + , spidermonkey_52, pango, readline, glib, libxml2, dbus }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 inherit (import ./src.nix fetchurl) name src; ··· 7 7 nativeBuildInputs = [ pkgconfig ]; 8 8 buildInputs = [ libxml2 gobjectIntrospection gtk3 glib pango readline dbus ]; 9 9 10 - propagatedBuildInputs = [ spidermonkey_38 ]; 11 - 12 - # GJS expects mozjs-38.pc but spidermonkey_38 only provides js.pc 13 - preConfigure = '' 14 - sed -i s/mozjs-38/js/ configure 15 - ''; 10 + propagatedBuildInputs = [ spidermonkey_52 ]; 16 11 17 12 postInstall = '' 18 13 sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
+3 -3
pkgs/desktops/gnome-3/core/gjs/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gjs-1.48.6"; 4 + name = "gjs-1.50.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz; 8 - sha256 = "e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312"; 7 + url = mirror://gnome/sources/gjs/1.50/gjs-1.50.2.tar.xz; 8 + sha256 = "2fad902cf7a7806454121c03918755c646fcfd6b08b52d488987db4e2d691ff3"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/gnome-backgrounds/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-backgrounds-3.24.0"; 4 + name = "gnome-backgrounds-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-backgrounds/3.24/gnome-backgrounds-3.24.0.tar.xz; 8 - sha256 = "cbda4c2159292940fa4b972df77379be716590c7b62bb4b2b9fa8e99749c71ca"; 7 + url = mirror://gnome/sources/gnome-backgrounds/3.26/gnome-backgrounds-3.26.2.tar.xz; 8 + sha256 = "3a8ba8d3463d70bce2377b168218e32367c0020f2d0caf611e7e39066081f94f"; 9 9 }; 10 10 }
+8 -9
pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
··· 1 - { stdenv, fetchurl, gnome3, pkgconfig, gtk3, intltool, glib 2 - , udev, itstool, libxml2, makeWrapper, libnotify, libcanberra_gtk3 }: 1 + { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib 2 + , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra_gtk3 }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 inherit (import ./src.nix fetchurl) name src; 6 6 7 - nativeBuildInputs = [ pkgconfig ]; 8 - buildInputs = [ intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme 9 - makeWrapper gnome3.gsettings_desktop_schemas itstool 10 - libnotify libcanberra_gtk3 ]; 7 + nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook ]; 8 + buildInputs = [ glib gtk3 udev libnotify libcanberra_gtk3 9 + gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas ]; 11 10 12 - preFixup = '' 13 - wrapProgram "$out/bin/bluetooth-sendto" \ 14 - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" 11 + postPatch = '' 12 + chmod +x meson_post_install.py # patchShebangs requires executable file 13 + patchShebangs meson_post_install.py 15 14 ''; 16 15 17 16 meta = with stdenv.lib; {
+3 -3
pkgs/desktops/gnome-3/core/gnome-bluetooth/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-bluetooth-3.20.1"; 4 + name = "gnome-bluetooth-3.26.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.1.tar.xz; 8 - sha256 = "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a"; 7 + url = mirror://gnome/sources/gnome-bluetooth/3.26/gnome-bluetooth-3.26.1.tar.xz; 8 + sha256 = "1d2c7b94fc76a833dad0d4d91344e9a5a7b4aad740c5a90944bd25c5be7e784f"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/gnome-calculator/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-calculator-3.24.0"; 4 + name = "gnome-calculator-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-3.24.0.tar.xz; 8 - sha256 = "44758ac719edd20067381073de3c643f842308f26da039412b1978a415202d10"; 7 + url = mirror://gnome/sources/gnome-calculator/3.26/gnome-calculator-3.26.0.tar.xz; 8 + sha256 = "62215b37fcd73a6bbb106ebd0f25051c81ff0cf6ad84fd4a3ea176bceb5863c7"; 9 9 }; 10 10 }
+4 -7
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
··· 3 3 , libchamplain, clutter_gtk, geocode_glib 4 4 , bash, wrapGAppsHook, itstool, folks, libnotify, libxml2 5 5 , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss 6 - , libsoup, vala_0_32, dbus_glib, automake, autoconf }: 6 + , libsoup, vala, dbus_glib, automake, autoconf }: 7 7 8 8 stdenv.mkDerivation rec { 9 9 inherit (import ./src.nix fetchurl) name src; ··· 17 17 touch src/*.vala 18 18 ''; 19 19 20 - nativeBuildInputs = [ pkgconfig ]; 21 - buildInputs = [ gtk3 glib intltool itstool evolution_data_server 22 - gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify 20 + nativeBuildInputs = [ vala automake autoconf pkgconfig intltool itstool wrapGAppsHook file ]; 21 + buildInputs = [ gtk3 glib evolution_data_server gnome3.gsettings_desktop_schemas libnotify 23 22 folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib 24 23 libxml2 libsoup gnome3.gnome_online_accounts nspr nss 25 - gdk_pixbuf gnome3.defaultIconTheme librsvg 26 - libchamplain clutter_gtk geocode_glib 27 - vala_0_32 automake autoconf db ]; 24 + gdk_pixbuf gnome3.defaultIconTheme libchamplain clutter_gtk geocode_glib db ]; 28 25 29 26 preFixup = '' 30 27 gappsWrapperArgs+=(
+3 -3
pkgs/desktops/gnome-3/core/gnome-contacts/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-contacts-3.22.1"; 4 + name = "gnome-contacts-3.26"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-contacts/3.22/gnome-contacts-3.22.1.tar.xz; 8 - sha256 = "e45297fb6f379a978605f7e183201be70dff2912f55072a363bdb1f67d9fe87b"; 7 + url = mirror://gnome/sources/gnome-contacts/3.26/gnome-contacts-3.26.tar.xz; 8 + sha256 = "f819ac74b2ad581f9741614627f49ef519713324afd9e4fc0ea5ac261a5f68c1"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/gnome-control-center/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-control-center-3.24.3"; 4 + name = "gnome-control-center-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.3.tar.xz; 8 - sha256 = "43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2"; 7 + url = mirror://gnome/sources/gnome-control-center/3.26/gnome-control-center-3.26.2.tar.xz; 8 + sha256 = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5"; 9 9 }; 10 10 }
+2 -2
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib 2 2 , intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland 3 - , gobjectIntrospection }: 3 + , libseccomp, gobjectIntrospection }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 inherit (import ./src.nix fetchurl) name src; ··· 14 14 buildInputs = [ python libxml2Python libxslt which libX11 15 15 xkeyboard_config isocodes itstool wayland 16 16 gtk3 glib intltool gnome_doc_utils libxkbfile 17 - gobjectIntrospection ]; 17 + libseccomp gobjectIntrospection ]; 18 18 19 19 propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ]; 20 20
+3 -3
pkgs/desktops/gnome-3/core/gnome-desktop/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-desktop-3.24.2"; 4 + name = "gnome-desktop-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-desktop/3.24/gnome-desktop-3.24.2.tar.xz; 8 - sha256 = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e"; 7 + url = mirror://gnome/sources/gnome-desktop/3.26/gnome-desktop-3.26.2.tar.xz; 8 + sha256 = "f7561a7a313fc474b2c390cd9696df1f5c1e1556080e43f4afe042b1060e5f2a"; 9 9 }; 10 10 }
+8 -15
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
··· 1 - { stdenv, intltool, fetchurl 2 - , pkgconfig, gtk3, glib 3 - , bash, makeWrapper, itstool, libxml2 4 - , gnome3, librsvg, gdk_pixbuf, file }: 1 + { stdenv, fetchurl, meson, ninja, pkgconfig, desktop_file_utils, appstream-glib, libxslt 2 + , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 3 + , gnome3, gtk, glib }: 5 4 6 5 stdenv.mkDerivation rec { 7 6 inherit (import ./src.nix fetchurl) name src; 8 7 9 8 doCheck = true; 10 9 11 - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; 12 - 13 10 propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 14 - propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; 11 + propagatedBuildInputs = [ gnome3.defaultIconTheme ]; 15 12 16 - nativeBuildInputs = [ pkgconfig ]; 17 - buildInputs = [ gtk3 glib intltool itstool libxml2 file 18 - gnome3.gsettings_desktop_schemas makeWrapper ]; 13 + nativeBuildInputs = [ meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool 14 + desktop_file_utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43]; 15 + buildInputs = [ gtk glib gnome3.gsettings_desktop_schemas ]; 19 16 20 - preFixup = '' 21 - wrapProgram "$out/bin/gnome-dictionary" \ 22 - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ 23 - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" 24 - ''; 17 + checkPhase = "meson test"; 25 18 26 19 meta = with stdenv.lib; { 27 20 homepage = https://wiki.gnome.org/Apps/Dictionary;
+3 -3
pkgs/desktops/gnome-3/core/gnome-dictionary/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-dictionary-3.24.0"; 4 + name = "gnome-dictionary-3.26.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.0.tar.xz; 8 - sha256 = "41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2"; 7 + url = mirror://gnome/sources/gnome-dictionary/3.26/gnome-dictionary-3.26.1.tar.xz; 8 + sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; 9 9 }; 10 10 }
+14 -15
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
··· 1 - { stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread 2 - , bash, gtk3, glib, wrapGAppsHook, cracklib, libnotify 3 - , itstool, gnome3, gdk_pixbuf, libxml2, python 4 - , libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }: 1 + { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread 2 + , meson, ninja, gtk, glib, wrapGAppsHook, libnotify 3 + , itstool, gnome3, gdk_pixbuf, libxml2 4 + , libcanberra_gtk3, libxslt, docbook_xsl, libpwquality }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 inherit (import ./src.nix fetchurl) name src; 8 8 9 - doCheck = true; 9 + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 10 10 11 - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; 11 + nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxslt docbook_xsl 12 + wrapGAppsHook libxml2 ]; 13 + buildInputs = [ gtk glib libsecret libpwquality libnotify libdvdread libcanberra_gtk3 14 + gdk_pixbuf udisks2 gnome3.defaultIconTheme 15 + gnome3.gnome_settings_daemon gnome3.gsettings_desktop_schemas ]; 12 16 13 - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 14 - 15 - nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ bash gtk3 glib intltool itstool 17 - libxslt libtool libsecret libpwquality cracklib 18 - libnotify libdvdread libcanberra_gtk3 docbook_xsl 19 - gdk_pixbuf gnome3.defaultIconTheme 20 - udisks2 gnome3.gnome_settings_daemon 21 - gnome3.gsettings_desktop_schemas wrapGAppsHook libxml2 ]; 17 + postPatch = '' 18 + chmod +x meson_post_install.py # patchShebangs requires executable file 19 + patchShebangs meson_post_install.py 20 + ''; 22 21 23 22 meta = with stdenv.lib; { 24 23 homepage = https://en.wikipedia.org/wiki/GNOME_Disks;
+3 -3
pkgs/desktops/gnome-3/core/gnome-disk-utility/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-disk-utility-3.24.1"; 4 + name = "gnome-disk-utility-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-disk-utility/3.24/gnome-disk-utility-3.24.1.tar.xz; 8 - sha256 = "878f0489947c813b44eb89f5fdc2790d757cd8565f26f22b950d55b8585653a1"; 7 + url = mirror://gnome/sources/gnome-disk-utility/3.26/gnome-disk-utility-3.26.2.tar.xz; 8 + sha256 = "aa2b96c2c64d8bde6cf802ff8da5796720d0becb21111342ced0637961e256f2"; 9 9 }; 10 10 }
+8 -16
pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix
··· 1 - { stdenv, intltool, fetchurl 2 - , pkgconfig, gtk3, glib 3 - , bash, wrapGAppsHook, itstool 4 - , gnome3, librsvg, gdk_pixbuf }: 1 + { stdenv, meson, ninja, gettext, fetchurl 2 + , pkgconfig, gtk3, glib, libxml2 3 + , wrapGAppsHook, gnome3 }: 5 4 6 5 stdenv.mkDerivation rec { 7 6 inherit (import ./src.nix fetchurl) name src; 8 7 9 8 doCheck = true; 10 9 11 - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; 10 + checkPhase = "meson test"; 12 11 13 - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 14 - 15 - nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ gtk3 glib intltool itstool gnome3.gnome_desktop 17 - gdk_pixbuf gnome3.defaultIconTheme librsvg 18 - gnome3.gsettings_desktop_schemas wrapGAppsHook ]; 12 + nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook libxml2 ]; 13 + buildInputs = [ gtk3 glib gnome3.gnome_desktop gnome3.defaultIconTheme ]; 19 14 20 - preFixup = '' 21 - gappsWrapperArgs+=( 22 - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" 23 - ) 24 - ''; 15 + # Do not run meson-postinstall.sh 16 + preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; 25 17 26 18 meta = with stdenv.lib; { 27 19 description = "Program that can preview fonts and create thumbnails for fonts";
+3 -3
pkgs/desktops/gnome-3/core/gnome-font-viewer/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-font-viewer-3.24.0"; 4 + name = "gnome-font-viewer-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-font-viewer/3.24/gnome-font-viewer-3.24.0.tar.xz; 8 - sha256 = "f3658216a744603fd2100d60de7b31062e014f02333e8433dcaf6a3bb4b7dc76"; 7 + url = mirror://gnome/sources/gnome-font-viewer/3.26/gnome-font-viewer-3.26.0.tar.xz; 8 + sha256 = "02768a62b4033de5ef9d00602e8c29e5de05255f879b0d9b4d731be9648fe9a0"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/gnome-keyring/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-keyring-3.20.0"; 4 + name = "gnome-keyring-3.20.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.0.tar.xz; 8 - sha256 = "bc17cecd748a0e46e302171d11c3ae3d76bba5258c441fabec3786f418e7ec99"; 7 + url = mirror://gnome/sources/gnome-keyring/3.20/gnome-keyring-3.20.1.tar.xz; 8 + sha256 = "134ci3mn6jjap59z3lrvyiip7zf2nlw5xvanr44yajs57xr4x5lp"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/gnome-online-accounts/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-online-accounts-3.24.2"; 4 + name = "gnome-online-accounts-3.26.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-online-accounts/3.24/gnome-online-accounts-3.24.2.tar.xz; 8 - sha256 = "b70ad52d1541e1e5192dd060bb11552a3af5007ab477aa81d265d1cd1cf7afba"; 7 + url = mirror://gnome/sources/gnome-online-accounts/3.26/gnome-online-accounts-3.26.1.tar.xz; 8 + sha256 = "603c110405cb89a01497a69967f10e3f3f36add3dc175b062ec4c5ed4485621b"; 9 9 }; 10 10 }
+3 -10
pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2 2 - , libsoup, json_glib, gmp, openssl, dleyna-server, makeWrapper }: 2 + , libsoup, json_glib, gmp, openssl, dleyna-server, wrapGAppsHook }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 inherit (import ./src.nix fetchurl) name src; 6 6 7 - nativeBuildInputs = [ pkgconfig ]; 7 + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; 8 8 buildInputs = [ glib gnome3.libgdata libxml2 libsoup gmp openssl 9 9 gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins 10 - gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart 10 + gnome3.gnome_online_accounts gnome3.libmediaart 11 11 gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest 12 12 dleyna-server ]; 13 13 14 14 enableParallelBuilding = true; 15 - 16 - preFixup = '' 17 - for f in $out/libexec/*; do 18 - wrapProgram "$f" \ 19 - --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-${gnome3.grilo-plugins.major}" 20 - done 21 - ''; 22 15 23 16 meta = with stdenv.lib; { 24 17 homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
+3 -3
pkgs/desktops/gnome-3/core/gnome-online-miners/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-online-miners-3.24.0"; 4 + name = "gnome-online-miners-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-online-miners/3.24/gnome-online-miners-3.24.0.tar.xz; 8 - sha256 = "8c0508f459b0364bed5f2f6a997aa81c1cbe75a94b23cc8fcfd83b0d3485d3ab"; 7 + url = mirror://gnome/sources/gnome-online-miners/3.26/gnome-online-miners-3.26.0.tar.xz; 8 + sha256 = "7f404db5eccb87524a5dfcef5b6f38b11047b371081559afbe48c34dbca2a98e"; 9 9 }; 10 10 }
+16 -12
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
··· 1 - { stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3 2 - , bash, gtk3, glib, wrapGAppsHook 3 - , itstool, gnome3, librsvg, gdk_pixbuf }: 1 + { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra_gtk3 2 + , bash, gtk3, glib, meson, ninja, wrapGAppsHook, appstream-glib 3 + , gnome3, librsvg, gdk_pixbuf }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 inherit (import ./src.nix fetchurl) name src; 7 7 8 8 doCheck = true; 9 9 10 - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; 10 + checkPhase = "meson test"; 11 + 12 + 13 + postPatch = '' 14 + chmod +x build-aux/postinstall.py # patchShebangs requires executable file 15 + patchShebangs build-aux/postinstall.py 16 + ''; 11 17 12 18 propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 13 19 propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ]; 14 20 15 - nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ bash gtk3 glib intltool itstool libcanberra_gtk3 17 - gnome3.gsettings_desktop_schemas wrapGAppsHook ]; 21 + nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 wrapGAppsHook ]; 22 + buildInputs = [ bash gtk3 glib libcanberra_gtk3 23 + gnome3.gsettings_desktop_schemas ]; 18 24 19 - preFixup = '' 20 - gappsWrapperArgs+=( 21 - --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share" 22 - ) 23 - ''; 25 + patches = [ 26 + ./prevent-cache-updates.patch 27 + ]; 24 28 25 29 meta = with stdenv.lib; { 26 30 homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot;
+21
pkgs/desktops/gnome-3/core/gnome-screenshot/prevent-cache-updates.patch
··· 1 + --- a/build-aux/postinstall.py 2 + +++ b/build-aux/postinstall.py 3 + @@ -8,18 +8,6 @@ 4 + 5 + # Packaging tools define DESTDIR and this isn't needed for them 6 + if 'DESTDIR' not in os.environ: 7 + - print('Updating icon cache...') 8 + - icon_cache_dir = os.path.join(datadir, 'icons', 'hicolor') 9 + - if not os.path.exists(icon_cache_dir): 10 + - os.makedirs(icon_cache_dir) 11 + - subprocess.call(['gtk-update-icon-cache', '-qtf', icon_cache_dir]) 12 + - 13 + - print('Updating desktop database...') 14 + - desktop_database_dir = os.path.join(datadir, 'applications') 15 + - if not os.path.exists(desktop_database_dir): 16 + - os.makedirs(desktop_database_dir) 17 + - subprocess.call(['update-desktop-database', '-q', desktop_database_dir]) 18 + - 19 + print('Compiling GSettings schemas...') 20 + schemas_dir = os.path.join(datadir, 'glib-2.0', 'schemas') 21 + if not os.path.exists(schemas_dir):
+3 -3
pkgs/desktops/gnome-3/core/gnome-screenshot/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-screenshot-3.22.0"; 4 + name = "gnome-screenshot-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-screenshot/3.22/gnome-screenshot-3.22.0.tar.xz; 8 - sha256 = "8a05f14b3c7c6cb42f9848ad0332034c7fe5c34a69742910203588fd60b00230"; 7 + url = mirror://gnome/sources/gnome-screenshot/3.26/gnome-screenshot-3.26.0.tar.xz; 8 + sha256 = "1bbc11595d3822f4b92319cdf9ba49dd00f5471b6046c590847dc424a874c8bb"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/gnome-session/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-session-3.24.1"; 4 + name = "gnome-session-3.26.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.1.tar.xz; 8 - sha256 = "3b4449238e396b95f9616dfd6f99d8345afaf30c7e3cb6a3549f253d9f966eee"; 7 + url = mirror://gnome/sources/gnome-session/3.26/gnome-session-3.26.1.tar.xz; 8 + sha256 = "d9414b368db982d3837ca106e64019f18e6cdd5b13965bea6c7d02ddf5103708"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/gnome-settings-daemon/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-settings-daemon-3.24.3"; 4 + name = "gnome-settings-daemon-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.3.tar.xz; 8 - sha256 = "68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593"; 7 + url = mirror://gnome/sources/gnome-settings-daemon/3.26/gnome-settings-daemon-3.26.2.tar.xz; 8 + sha256 = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/gnome-shell-extensions/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-shell-extensions-3.24.3"; 4 + name = "gnome-shell-extensions-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz; 8 - sha256 = "3c7defc6512d7ed9f09eb82342d7b6c8f5fe8dcac3f0126ca7e0569feeb50a79"; 7 + url = mirror://gnome/sources/gnome-shell-extensions/3.26/gnome-shell-extensions-3.26.2.tar.xz; 8 + sha256 = "aefda4d810ef5ceb9402e2d620f4bdc1dc40c9cc4f6a51749840f7dd08628ab6"; 9 9 }; 10 10 }
+35 -29
pkgs/desktops/gnome-3/core/gnome-shell/default.nix
··· 1 - { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret 1 + { fetchurl, fetchpatch, stdenv, meson, ninja, pkgconfig, gnome3, json_glib, libcroco, gettext, libsecret 2 2 , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core 3 - , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip 4 - , sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2 5 - , libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper 6 - , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }: 3 + , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip, glibcLocales 4 + , sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42 5 + , libpulseaudio, libical, nss, gobjectIntrospection, gstreamer, wrapGAppsHook 6 + , accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet 7 + , gst_all_1 }: 7 8 8 9 # 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 10 ··· 14 15 inherit (import ./src.nix fetchurl) name src; 15 16 16 17 # Needed to find /etc/NetworkManager/VPN 17 - configureFlags = [ "--sysconfdir=/etc" ]; 18 + mesonFlags = [ "--sysconfdir=/etc" ]; 19 + 20 + LANG = "en_US.UTF-8"; 18 21 22 + nativeBuildInputs = [ meson ninja gettext docbook_xsl docbook_xsl_ns docbook_xml_dtd_42 perl wrapGAppsHook glibcLocales ]; 19 23 buildInputs = with gnome3; 20 24 [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice 21 - libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf 25 + libcroco libsecret pkgconfig libsoup polkit gdk_pixbuf 22 26 (librsvg.override { enableIntrospection = true; }) 23 - clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns 27 + clutter networkmanager libstartup_notification telepathy_glib 24 28 libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server 25 - libical libtool nss gtk gstreamer makeWrapper gdm 29 + libical nss gtk gstreamer gdm 26 30 libcanberra_gtk3 gnome_control_center geoclue2 27 31 defaultIconTheme sqlite gnome3.gnome-bluetooth 28 32 libgweather # not declared at build time, but typelib is needed at runtime 29 33 gnome3.gnome-clocks # schemas needed 30 34 at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon 35 + gst_all_1.gst-plugins-good # recording 31 36 gobjectIntrospection (stdenv.lib.getLib dconf) ]; 37 + propagatedUserEnvPkgs = [ 38 + # Needed to support on-screen keyboard used with touch screen devices 39 + # see https://github.com/NixOS/nixpkgs/issues/25968 40 + gnome3.caribou 41 + ]; 32 42 33 - installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; 43 + patches = [ 44 + (fetchpatch { 45 + name = "0001-build-Add-missing-dependency-to-run-js-test.patch"; 46 + url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016; 47 + sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm"; 48 + }) 49 + ./fix-paths.patch 50 + ]; 34 51 35 - preBuild = '' 52 + postPatch = '' 36 53 patchShebangs src/data-to-c.pl 37 - substituteInPlace data/Makefile --replace " install-keysDATA" "" 38 54 39 55 substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" 40 56 substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" 57 + substituteInPlace js/ui/extensionDownloader.js --replace "unzip" "${unzip}/bin/unzip" 41 58 ''; 42 59 43 - 44 - preFixup = with gnome3; '' 45 - wrapProgram "$out/bin/gnome-shell" \ 46 - --prefix PATH : "${unzip}/bin" \ 47 - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ 48 - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ 49 - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ 50 - --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \ 51 - --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" 52 - 53 - wrapProgram "$out/bin/gnome-shell-extension-prefs" \ 54 - --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" 55 - 56 - wrapProgram "$out/libexec/gnome-shell-calendar-server" \ 57 - --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \ 58 - --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" 60 + postInstall = '' 61 + glib-compile-schemas $out/share/glib-2.0/schemas 62 + ''; 59 63 60 - echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path 64 + postFixup = '' 65 + # Patched meson does not add internal libraries to rpath 66 + patchelf --set-rpath "$out/lib/gnome-shell:$(patchelf --print-rpath $out/bin/.gnome-shell-wrapped)" $out/bin/.gnome-shell-wrapped 61 67 ''; 62 68 63 69 enableParallelBuilding = true;
+18
pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
··· 1 + diff --git a/meson.build b/meson.build 2 + index 4c1f5c63b..a9edb8795 100644 3 + --- a/meson.build 4 + +++ b/meson.build 5 + @@ -59,12 +59,7 @@ servicedir = join_paths(datadir, 'dbus-1', 'services') 6 + 7 + plugindir = get_variable('BROWSER_PLUGIN_DIR', mozplugindir) 8 + 9 + -keybindings_dep = dependency('gnome-keybindings', required: false) 10 + -if keybindings_dep.found() 11 + - keysdir = keybindings_dep.get_pkgconfig_variable('keysdir') 12 + -else 13 + - keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings') 14 + -endif 15 + +keysdir = join_paths(datadir, 'gnome-control-center', 'keybindings') 16 + 17 + atk_bridge_dep = dependency('atk-bridge-2.0') 18 + canberra_dep = dependency('libcanberra')
+3 -3
pkgs/desktops/gnome-3/core/gnome-shell/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-shell-3.24.3"; 4 + name = "gnome-shell-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz; 8 - sha256 = "58b13308aa1b8dcbf1f08d5a052a61f8094ffd3afa2c788c91e1ceeacde840b8"; 7 + url = mirror://gnome/sources/gnome-shell/3.26/gnome-shell-3.26.2.tar.xz; 8 + sha256 = "e5a87f2f838d981db9823352b90b2ce2f40d24d31ed9f062dccfa41b820e0b1c"; 9 9 }; 10 10 }
+23 -7
pkgs/desktops/gnome-3/core/gnome-software/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit 2 - , appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3 3 - , json_glib, libsecret, valgrind-light }: 1 + { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, wrapGAppsHook, packagekit, ostree 2 + , glib, appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3, libxslt 3 + , json_glib, libsecret, valgrind-light, docbook_xsl, docbook_xml_dtd_42, gtk_doc, desktop_file_utils }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 inherit (import ./src.nix fetchurl) name src; 7 7 8 - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; 9 - buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup 8 + nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook libxslt docbook_xml_dtd_42 9 + valgrind-light docbook_xsl gtk_doc desktop_file_utils ]; 10 + buildInputs = [ gnome3.gtk glib packagekit appstream-glib libsoup 10 11 gnome3.gsettings_desktop_schemas gnome3.gnome_desktop 11 - gtkspell3 json_glib libsecret 12 - polkit attr acl libyaml valgrind-light ]; 12 + gtkspell3 json_glib libsecret ostree 13 + polkit attr acl libyaml ]; 13 14 propagatedBuildInputs = [ isocodes ]; 15 + 16 + NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; 17 + 18 + postPatch = '' 19 + patchShebangs meson_post_install.sh 20 + ''; 21 + 22 + mesonFlags = [ 23 + "-Denable-flatpak=false" 24 + "-Denable-rpm=false" 25 + "-Denable-fwupd=false" 26 + "-Denable-oauth=false" 27 + "-Denable-ubuntu-reviews=false" 28 + "-Denable-gudev=false" 29 + ]; 14 30 15 31 postInstall = '' 16 32 mkdir -p $out/share/xml/
+3 -3
pkgs/desktops/gnome-3/core/gnome-software/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-software-3.24.3"; 4 + name = "gnome-software-3.26.3"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-software/3.24/gnome-software-3.24.3.tar.xz; 8 - sha256 = "0dbc8cbf0e46c5ef8c6a34391622d1532cf05c49976b39a8b8ee1fff8d8f75e3"; 7 + url = mirror://gnome/sources/gnome-software/3.26/gnome-software-3.26.3.tar.xz; 8 + sha256 = "2f74fd5fb222c99d4fcb91500cea0c62a0eb8022700bdea51acecb41c63f8e48"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/gnome-system-monitor/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-system-monitor-3.24.0"; 4 + name = "gnome-system-monitor-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-3.24.0.tar.xz; 8 - sha256 = "c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4"; 7 + url = mirror://gnome/sources/gnome-system-monitor/3.26/gnome-system-monitor-3.26.0.tar.xz; 8 + sha256 = "f848a8c2ca5e164cf09d3a205dd49e4e4bf4b60d43b0969c10443eb519d0e6b3"; 9 9 }; 10 10 }
+4 -4
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango 2 - , gnome_doc_utils, intltool, libX11, which, libuuid, vala_0_32 1 + { stdenv, fetchurl, pkgconfig, libxml2, gnome3 2 + , gnome_doc_utils, intltool, which, libuuid, vala 3 3 , desktop_file_utils, itstool, wrapGAppsHook, appdata-tools }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 inherit (import ./src.nix fetchurl) name src; 7 7 8 8 buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools 9 - gnome3.dconf itstool gnome3.nautilus vala_0_32 ]; 9 + gnome3.dconf itstool gnome3.nautilus ]; 10 10 11 11 nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 12 - desktop_file_utils wrapGAppsHook ]; 12 + vala desktop_file_utils wrapGAppsHook ]; 13 13 14 14 # Silly ./configure, it looks for dbus file from gnome-shell in the 15 15 # installation tree of the package it is configuring.
+3 -3
pkgs/desktops/gnome-3/core/gnome-terminal/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-terminal-3.24.2"; 4 + name = "gnome-terminal-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz; 8 - sha256 = "281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f"; 7 + url = mirror://gnome/sources/gnome-terminal/3.26/gnome-terminal-3.26.2.tar.xz; 8 + sha256 = "3a9ba414a814569476515275ad303d8056f296b2669234447712559aa97005b0"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/gnome-user-docs/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-user-docs-3.24.2"; 4 + name = "gnome-user-docs-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.2.tar.xz; 8 - sha256 = "c1c53059c892bf9f78c7a934ab3a05ece35e2dacd828272e74a77a4f5975e65f"; 7 + url = mirror://gnome/sources/gnome-user-docs/3.26/gnome-user-docs-3.26.2.tar.xz; 8 + sha256 = "e7d7f0434624ef6f21803c798d8672331f065485bdf59d44ac5b6b5f14fa1b78"; 9 9 }; 10 10 }
+4 -4
pkgs/desktops/gnome-3/core/gsound/default.nix
··· 3 3 let 4 4 majVer = "1.0"; 5 5 in stdenv.mkDerivation rec { 6 - name = "gsound-${majVer}.1"; 6 + name = "gsound-${majVer}.2"; 7 7 8 8 src = fetchurl { 9 9 url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz"; 10 - sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; 10 + sha256 = "bba8ff30eea815037e53bee727bbd5f0b6a2e74d452a7711b819a7c444e78e53"; 11 11 }; 12 12 13 - nativeBuildInputs = [ pkgconfig ]; 14 - buildInputs = [ glib libcanberra_gtk2 gobjectIntrospection libtool ]; 13 + nativeBuildInputs = [ pkgconfig gobjectIntrospection libtool gnome3.vala ]; 14 + buildInputs = [ glib libcanberra_gtk2 ]; 15 15 16 16 meta = with stdenv.lib; { 17 17 homepage = https://wiki.gnome.org/Projects/GSound;
+1 -1
pkgs/desktops/gnome-3/core/libgee/default.nix
··· 15 15 16 16 patches = [ ./fix_introspection_paths.patch ]; 17 17 18 - nativeBuildInputs = [ pkgconfig autoconf vala pkgconfig gobjectIntrospection ]; 18 + nativeBuildInputs = [ pkgconfig autoconf vala gobjectIntrospection ]; 19 19 buildInputs = [ glib ]; 20 20 21 21 meta = with stdenv.lib; {
+8 -7
pkgs/desktops/gnome-3/core/libgepub/default.nix
··· 1 - { stdenv, fetchurl, autoconf, pkgconfig, glib, gobjectIntrospection, gnome3 1 + { stdenv, fetchurl, meson, ninja, pkgconfig, glib, gobjectIntrospection, gnome3 2 2 , webkitgtk, libsoup, libxml2, libarchive }: 3 3 stdenv.mkDerivation rec { 4 - name = "libgepub-${version}"; 5 - version = "0.4"; 4 + name = "libgepub-${version}.2"; 5 + version = "0.5"; 6 6 7 7 src = fetchurl { 8 8 url = "mirror://gnome/sources/libgepub/${version}/${name}.tar.xz"; 9 - sha256 = "5666a1c4d186d205bd2d91b71d4c1cd5426025569114a765dd913a564f149ff4"; 9 + sha256 = "0f1bczy3b00kj7mhm80xgpcgibh8h0pgcr46l4wifi45jacji0w4"; 10 10 }; 11 11 12 12 doCheck = true; 13 13 14 - nativeBuildInputs = [ pkgconfig ]; 15 - buildInputs = [ autoconf glib gobjectIntrospection webkitgtk libsoup 16 - libxml2 libarchive ]; 14 + checkPhase = "meson test"; 15 + 16 + nativeBuildInputs = [ meson ninja pkgconfig gobjectIntrospection ]; 17 + buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; 17 18 18 19 meta = with stdenv.lib; { 19 20 description = "GObject based library for handling and rendering epub documents";
+3 -3
pkgs/desktops/gnome-3/core/libgnomekbd/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "libgnomekbd-3.22.0.1"; 4 + name = "libgnomekbd-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/libgnomekbd/3.22/libgnomekbd-3.22.0.1.tar.xz; 8 - sha256 = "4efdb6b8ec92f04caced710b5edb285fb27715059ed6ca5e100b6933999a93de"; 7 + url = mirror://gnome/sources/libgnomekbd/3.26/libgnomekbd-3.26.0.tar.xz; 8 + sha256 = "ea3b418c57c30615f7ee5b6f718def7c9d09ce34637324361150744258968875"; 9 9 }; 10 10 }
+7 -2
pkgs/desktops/gnome-3/core/libgweather/default.nix
··· 4 4 stdenv.mkDerivation rec { 5 5 inherit (import ./src.nix fetchurl) name src; 6 6 7 - configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ]; 7 + configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" "--enable-vala" ]; 8 8 propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ]; 9 - nativeBuildInputs = [ pkgconfig intltool ]; 9 + nativeBuildInputs = [ pkgconfig intltool gnome3.vala ]; 10 + 11 + # Prevent building vapi into ${vala} derivation directory 12 + prePatch = '' 13 + substituteInPlace libgweather/Makefile.in --replace "\$(DESTDIR)\$(vapidir)" "\$(DESTDIR)\$(girdir)/../vala/vapi" 14 + ''; 10 15 11 16 meta = with stdenv.lib; { 12 17 platforms = platforms.linux;
+3 -3
pkgs/desktops/gnome-3/core/libgweather/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "libgweather-3.24.1"; 4 + name = "libgweather-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/libgweather/3.24/libgweather-3.24.1.tar.xz; 8 - sha256 = "1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c"; 7 + url = mirror://gnome/sources/libgweather/3.26/libgweather-3.26.0.tar.xz; 8 + sha256 = "5b84badc0b3ecffff5db1bb9a7cc4dd4e400a8eb3f1282348f8ee6ba33626b6e"; 9 9 }; 10 10 }
+1 -10
pkgs/desktops/gnome-3/core/mutter/default.nix
··· 1 - { fetchurl, fetchpatch, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo 1 + { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo 2 2 , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 3 3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput 4 4 , libgudev, libwacom, xwayland, autoreconfHook }: ··· 34 34 gnome3.geocode_glib libudev libinput libgudev libwacom 35 35 libcanberra_gtk3 zenity xkeyboard_config libxkbfile 36 36 libxkbcommon ]; 37 - 38 - patches = [ 39 - # https://bugzilla.gnome.org/show_bug.cgi?id=760670 40 - (fetchpatch { 41 - name = "libgudev-232.patch"; 42 - url = https://bugzilla.gnome.org/attachment.cgi?id=358904; 43 - sha256 = "0chvd7g9f2zp3a0gdhvinsfvp2h10rwb6a8ja386vsrl93ac8pix"; 44 - }) 45 - ]; 46 37 47 38 preFixup = '' 48 39 wrapProgram "$out/bin/mutter" \
+3 -3
pkgs/desktops/gnome-3/core/mutter/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "mutter-3.24.4"; 4 + name = "mutter-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/mutter/3.24/mutter-3.24.4.tar.xz; 8 - sha256 = "7300b3fbf1bd0f7fe25e4869dd37134f2127bb6d9b8aa3aadd0eaf3c8bbf9aea"; 7 + url = mirror://gnome/sources/mutter/3.26/mutter-3.26.2.tar.xz; 8 + sha256 = "83309feb05a4635c47713665c0592af8ab6d7f17a36e4bd626d67609b6422fab"; 9 9 }; 10 10 }
+11 -7
pkgs/desktops/gnome-3/core/nautilus/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif 2 - , gtk, gnome3, libunique, intltool, gobjectIntrospection, gnome-autoar, glib 3 - , libnotify, wrapGAppsHook, exempi, librsvg, tracker, libselinux, gdk_pixbuf }: 1 + { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2, desktop_file_utils, wrapGAppsHook 2 + , gtk, gnome3, gnome-autoar, glib, dbus_glib, shared_mime_info, libnotify, libexif 3 + , exempi, librsvg, tracker, tracker-miners, libselinux, gdk_pixbuf }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 inherit (import ./src.nix fetchurl) name src; 7 7 8 - nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; 8 + nativeBuildInputs = [ meson ninja pkgconfig libxml2 gettext wrapGAppsHook desktop_file_utils ]; 9 9 10 - buildInputs = [ libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg 11 - gnome3.gnome_desktop gnome3.adwaita-icon-theme 12 - gnome3.gsettings_desktop_schemas gnome3.dconf libnotify tracker libselinux ]; 10 + buildInputs = [ dbus_glib shared_mime_info libexif gtk exempi libnotify libselinux 11 + tracker tracker-miners gnome3.gnome_desktop gnome3.adwaita-icon-theme 12 + gnome3.gsettings_desktop_schemas ]; 13 13 14 14 propagatedBuildInputs = [ gnome-autoar ]; 15 15 ··· 26 26 27 27 # hardeningDisable = [ "format" ]; 28 28 enableParallelBuilding = true; 29 + 30 + postPatch = '' 31 + patchShebangs build-aux/meson/postinstall.py 32 + ''; 29 33 30 34 patches = [ ./extension_dir.patch ]; 31 35
+3 -3
pkgs/desktops/gnome-3/core/nautilus/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "nautilus-3.24.2.1"; 4 + name = "nautilus-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz; 8 - sha256 = "357d9d051fcc2c385ce9b3beb2db2ea1874b7cdf507ca10274a063023e1a61b3"; 7 + url = mirror://gnome/sources/nautilus/3.26/nautilus-3.26.2.tar.xz; 8 + sha256 = "79c99404c665ea76b3db86f261fbd28a62b54c51429b05c3314462c9de2614b4"; 9 9 }; 10 10 }
+10 -12
pkgs/desktops/gnome-3/core/simple-scan/default.nix
··· 1 - { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool 2 - , libusb1, libxml2, pkgconfig, sane-backends, vala_0_32, wrapGAppsHook 3 - , gnome3 }: 1 + { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, wrapGAppsHook 2 + , cairo, gdk_pixbuf, colord, glib, gtk, gusb, packagekit, libwebp 3 + , libxml2, sane-backends, vala, gnome3 }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 inherit (import ./src.nix fetchurl) name src; 7 7 8 - buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ]; 9 - nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; 8 + buildInputs = [ cairo gdk_pixbuf colord glib gnome3.defaultIconTheme gusb 9 + gtk libwebp packagekit sane-backends vala ]; 10 + nativeBuildInputs = [ meson ninja gettext itstool pkgconfig wrapGAppsHook libxml2 ]; 10 11 11 - configureFlags = [ "--disable-packagekit" ]; 12 + postPatch = '' 13 + patchShebangs data/meson_compile_gschema.py 12 14 13 - patchPhase = '' 14 15 sed -i -e 's#Icon=scanner#Icon=simple-scan#g' ./data/simple-scan.desktop.in 15 - ''; 16 - 17 - preBuild = '' 18 - # Clean up stale .c files referencing packagekit headers as of 3.20.0: 19 - make clean 20 16 ''; 21 17 22 18 postInstall = '' ··· 38 34 enableParallelBuilding = true; 39 35 40 36 doCheck = true; 37 + 38 + checkPhase = "meson test"; 41 39 42 40 meta = with stdenv.lib; { 43 41 description = "Simple scanning utility";
+3 -3
pkgs/desktops/gnome-3/core/simple-scan/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "simple-scan-3.22.0.1"; 4 + name = "simple-scan-3.26.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/simple-scan/3.22/simple-scan-3.22.0.1.tar.xz; 8 - sha256 = "c505b6e63379c9256fbeaa4def3e595fd063d46a8a852ed90218d336291d2b50"; 7 + url = mirror://gnome/sources/simple-scan/3.26/simple-scan-3.26.2.tar.xz; 8 + sha256 = "d172825b1b77e2e32c21fc847fd670c4711a504b09688f8567a98ac9516fe212"; 9 9 }; 10 10 }
+2 -2
pkgs/desktops/gnome-3/core/totem-pl-parser/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }: 1 + { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gmime, libxml2, libsoup, gnome3 }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 inherit (import ./src.nix fetchurl) name src; 5 5 6 - nativeBuildInputs = [ pkgconfig file intltool ]; 6 + nativeBuildInputs = [ meson ninja pkgconfig gettext ]; 7 7 buildInputs = [ gmime libxml2 libsoup ]; 8 8 9 9 meta = with stdenv.lib; {
+3 -3
pkgs/desktops/gnome-3/core/totem-pl-parser/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "totem-pl-parser-3.10.2"; 4 + name = "totem-pl-parser-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.2.tar.xz; 8 - sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469"; 7 + url = mirror://gnome/sources/totem-pl-parser/3.26/totem-pl-parser-3.26.0.tar.xz; 8 + sha256 = "1jzvq7s6qdsdpbc58jpcwvyj7qsq58r65kmnbknjzd79j4rsalzi"; 9 9 }; 10 10 }
+25 -12
pkgs/desktops/gnome-3/core/totem/default.nix
··· 1 - { stdenv, intltool, fetchurl, gst_all_1 1 + { stdenv, fetchurl, meson, ninja, intltool, gst_all_1, clutter 2 2 , clutter_gtk, clutter-gst, python3Packages, shared_mime_info 3 3 , pkgconfig, gtk3, glib, gobjectIntrospection 4 - , bash, wrapGAppsHook, itstool, libxml2, dbus_glib 5 - , gnome3, librsvg, gdk_pixbuf, file, tracker, nautilus }: 4 + , bash, wrapGAppsHook, itstool, libxml2, dbus_glib, vala, gnome3, librsvg 5 + , gdk_pixbuf, file, tracker, nautilus }: 6 6 7 7 stdenv.mkDerivation rec { 8 8 inherit (import ./src.nix fetchurl) name src; ··· 15 15 16 16 propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 17 17 18 - nativeBuildInputs = [ pkgconfig ]; 19 - buildInputs = [ gtk3 glib intltool itstool libxml2 gnome3.grilo 20 - clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins 21 - gst_all_1.gstreamer gst_all_1.gst-plugins-base 22 - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-libav 23 - gnome3.libpeas shared_mime_info dbus_glib 24 - gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop 25 - gnome3.gsettings_desktop_schemas wrapGAppsHook file tracker nautilus ]; 18 + nativeBuildInputs = [ meson ninja vala pkgconfig intltool python3Packages.python itstool file wrapGAppsHook ]; 19 + buildInputs = [ gtk3 glib gnome3.grilo clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins 20 + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad 21 + gst_all_1.gst-plugins-ugly gst_all_1.gst-libav gnome3.libpeas shared_mime_info dbus_glib 22 + gdk_pixbuf libxml2 gnome3.defaultIconTheme gnome3.gnome_desktop 23 + gnome3.gsettings_desktop_schemas tracker nautilus ]; 26 24 27 25 propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; 28 26 29 - configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; 27 + checkPhase = "meson test"; 28 + 29 + patches = [ 30 + (fetchurl { 31 + name = "remove-pycompile.patch"; 32 + url = "https://bug787965.bugzilla-attachments.gnome.org/attachment.cgi?id=360204"; 33 + sha256 = "1iphlazllv42k553jqh3nqrrh5jb63gy3nhj4ipwc9xh4sg2irhi"; 34 + }) 35 + ]; 36 + 37 + postPatch = '' 38 + chmod +x meson_compile_python.py meson_post_install.py # patchShebangs requires executable file 39 + patchShebangs . 40 + ''; 41 + 42 + mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" ]; 30 43 31 44 GI_TYPELIB_PATH = "$out/lib/girepository-1.0"; 32 45 wrapPrefixVariables = [ "PYTHONPATH" ];
+3 -3
pkgs/desktops/gnome-3/core/totem/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "totem-3.24.0"; 4 + name = "totem-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/totem/3.24/totem-3.24.0.tar.xz; 8 - sha256 = "9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01"; 7 + url = mirror://gnome/sources/totem/3.26/totem-3.26.0.tar.xz; 8 + sha256 = "e32fb9a68097045e75c87ad1b8177f5c01aea2a13dcb3b2e71a0f9570fe9ee13"; 9 9 }; 10 10 }
+45
pkgs/desktops/gnome-3/core/tracker-miners/default.nix
··· 1 + { stdenv, intltool, fetchurl, libxml2, upower 2 + , pkgconfig, gtk3, glib 3 + , bash, wrapGAppsHook, itstool, vala, sqlite, libxslt 4 + , gnome3, librsvg, gdk_pixbuf, libnotify 5 + , evolution_data_server, gst_all_1, poppler 6 + , icu, taglib, libjpeg, libtiff, giflib, libcue 7 + , libvorbis, flac, exempi, networkmanager 8 + , libpng, libexif, libgsf, libuuid, bzip2 9 + , libsoup, json_glib, libseccomp 10 + , libiptcdata }: 11 + 12 + stdenv.mkDerivation rec { 13 + inherit (import ./src.nix fetchurl) name src; 14 + 15 + NIX_CFLAGS_COMPILE = "-I${poppler.dev}/include/poppler"; 16 + 17 + enableParallelBuilding = true; 18 + 19 + nativeBuildInputs = [ vala pkgconfig intltool itstool libxslt wrapGAppsHook ]; 20 + # TODO: add libgrss, libenca 21 + buildInputs = [ 22 + bzip2 evolution_data_server exempi flac giflib glib gnome3.totem-pl-parser 23 + gnome3.tracker gst_all_1.gst-plugins-base gst_all_1.gstreamer icu 24 + json_glib libcue libexif libgsf libiptcdata libjpeg libpng libseccomp libsoup 25 + libtiff libuuid libvorbis libxml2 poppler taglib upower 26 + ]; 27 + 28 + LANG = "en_US.UTF-8"; # for running tests 29 + 30 + doCheck = true; 31 + 32 + postPatch = '' 33 + substituteInPlace src/libtracker-common/tracker-domain-ontology.c --replace \ 34 + 'SHAREDIR, "tracker", "domain-ontologies"' \ 35 + '"${gnome3.tracker}/share", "tracker", "domain-ontologies"' 36 + ''; 37 + 38 + meta = with stdenv.lib; { 39 + homepage = https://wiki.gnome.org/Projects/Tracker; 40 + description = "Desktop-neutral user information store, search tool and indexer"; 41 + maintainers = gnome3.maintainers; 42 + license = licenses.gpl2; 43 + platforms = platforms.linux; 44 + }; 45 + }
+10
pkgs/desktops/gnome-3/core/tracker-miners/src.nix
··· 1 + # Autogenerated by maintainers/scripts/gnome.sh update 2 + 3 + fetchurl: { 4 + name = "tracker-miners-2.0.2"; 5 + 6 + src = fetchurl { 7 + url = mirror://gnome/sources/tracker-miners/2.0/tracker-miners-2.0.2.tar.xz; 8 + sha256 = "cf417ece944c997f630dda41a7f5c449d609fa53dbb34fae7caa4c7af1e0e8ef"; 9 + }; 10 + }
+12 -32
pkgs/desktops/gnome-3/core/tracker/default.nix
··· 1 - { stdenv, intltool, fetchurl, libxml2, upower 2 - , pkgconfig, gtk3, glib 3 - , bash, wrapGAppsHook, itstool, vala_0_32, sqlite, libxslt 4 - , gnome3, librsvg, gdk_pixbuf, file, libnotify 5 - , evolution_data_server, gst_all_1, poppler 6 - , icu, taglib, libjpeg, libtiff, giflib, libcue 7 - , libvorbis, flac, exempi, networkmanager 8 - , libpng, libexif, libgsf, libuuid, bzip2 9 - , libsoup, json_glib, libseccomp }: 1 + { stdenv, fetchurl, fetchpatch, intltool, pkgconfig 2 + , libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt 3 + , gnome3, icu, libuuid, networkmanager, libsoup, json_glib }: 10 4 11 5 stdenv.mkDerivation rec { 12 - 13 6 inherit (import ./src.nix fetchurl) name src; 14 - 15 - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 16 - 17 - NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0 -I${poppler.dev}/include/poppler"; 18 7 19 8 enableParallelBuilding = true; 20 9 21 - nativeBuildInputs = [ pkgconfig ]; 22 - buildInputs = [ vala_0_32 gtk3 glib intltool itstool libxml2 23 - bzip2 gnome3.totem-pl-parser libxslt 24 - gnome3.gsettings_desktop_schemas wrapGAppsHook 25 - file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite 26 - upower libnotify evolution_data_server gnome3.libgee 27 - gst_all_1.gstreamer gst_all_1.gst-plugins-base flac 28 - poppler icu taglib libjpeg libtiff giflib libvorbis 29 - exempi networkmanager libpng libexif libgsf libuuid 30 - libsoup json_glib libseccomp 31 - ]; 10 + nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook ]; 11 + # TODO: add libstemmer 12 + buildInputs = [ 13 + glib libxml2 sqlite upower icu networkmanager libsoup libuuid json_glib 14 + ]; 32 15 33 - preConfigure = '' 34 - substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql" 35 - ''; 16 + # TODO: figure out wrapping unit tests, some of them fail on missing gsettings_desktop_schemas 17 + configureFlags = [ "--disable-unit-tests" ]; 36 18 37 - preFixup = '' 38 - gappsWrapperArgs+=( 39 - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share" 40 - ) 19 + postPatch = '' 20 + patchShebangs utils/g-ir-merge/g-ir-merge 41 21 ''; 42 22 43 23 meta = with stdenv.lib; {
+3 -3
pkgs/desktops/gnome-3/core/tracker/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "tracker-1.12.3"; 4 + name = "tracker-2.0.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/tracker/1.12/tracker-1.12.3.tar.xz; 8 - sha256 = "1mpq418lzba7fad0w0m3bnxvz3khf461b5zya8zmq5n1g0w99ki3"; 7 + url = mirror://gnome/sources/tracker/2.0/tracker-2.0.1.tar.xz; 8 + sha256 = "ac5c9f4dbb0741af5877ae2818d8c053aa9a431477a924a17976bb7e44411e47"; 9 9 }; 10 10 }
+3 -4
pkgs/desktops/gnome-3/core/vte/default.nix
··· 1 1 { stdenv, fetchurl, intltool, pkgconfig 2 - , gnome3, ncurses, gobjectIntrospection, vala_0_32, libxml2, gnutls 2 + , gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls 3 3 , fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf, pcre2 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 inherit (import ./src.nix fetchurl) name src; 8 8 9 - nativeBuildInputs = [ pkgconfig ]; 10 - buildInputs = [ gobjectIntrospection intltool gnome3.glib 11 - gnome3.gtk3 ncurses vala_0_32 libxml2 gperf ]; 9 + nativeBuildInputs = [ gobjectIntrospection intltool pkgconfig vala gperf libxml2 ]; 10 + buildInputs = [ gnome3.glib gnome3.gtk3 ncurses ]; 12 11 13 12 propagatedBuildInputs = [ gnutls pcre2 ]; 14 13
+3 -3
pkgs/desktops/gnome-3/core/vte/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "vte-0.50.1"; 4 + name = "vte-0.50.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/vte/0.50/vte-0.50.1.tar.xz; 8 - sha256 = "cf1708e3e573160e1db107014b3ef70888fefe6b668373fed70e8d1cac45a8c2"; 7 + url = mirror://gnome/sources/vte/0.50/vte-0.50.2.tar.xz; 8 + sha256 = "79dd316bfaff48f2fb74d066baae0d830e1f44436796fe410a57297e5c5f09cf"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/yelp/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "yelp-3.22.0"; 4 + name = "yelp-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/yelp/3.22/yelp-3.22.0.tar.xz; 8 - sha256 = "8616b77c239aaa731312609f192c9b2c71d54b2cae42ff23efa23b5b3188778e"; 7 + url = mirror://gnome/sources/yelp/3.26/yelp-3.26.0.tar.xz; 8 + sha256 = "e4cb02ed2f44cfec3c352c957f8a461d9689cbc06eb3b503a58ffe92e1753f1b"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/core/zenity/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "zenity-3.24.0"; 4 + name = "zenity-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/zenity/3.24/zenity-3.24.0.tar.xz; 8 - sha256 = "6ff0a026ec94e5bc1b30f78df91e54f4f82fd982f4c29b52fe5dacc886a9f7f7"; 7 + url = mirror://gnome/sources/zenity/3.26/zenity-3.26.0.tar.xz; 8 + sha256 = "6a7f34626dd62b751fe22bcdb32f3558f8a8fdddcc9406893dd264f0ac18e830"; 9 9 }; 10 10 }
+5 -3
pkgs/desktops/gnome-3/default.nix
··· 13 13 14 14 callPackage = pkgs.newScope self; 15 15 16 - version = "3.24"; 16 + version = "3.26"; 17 17 maintainers = with pkgs.lib.maintainers; [ lethalman ]; 18 18 19 19 corePackages = with gnome3; [ ··· 54 54 gnome3 = self // { recurseForDerivations = false; }; 55 55 gtk = gtk3; 56 56 gtkmm = gtkmm3; 57 - vala = pkgs.vala_0_32; 57 + vala = pkgs.vala_0_38; 58 58 gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; 59 59 60 60 # Simplify the nixos module and gnome packages ··· 237 237 238 238 totem-pl-parser = callPackage ./core/totem-pl-parser { }; 239 239 240 - tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; }; 240 + tracker = callPackage ./core/tracker { }; 241 + 242 + tracker-miners = callPackage ./core/tracker-miners { }; 241 243 242 244 vte = callPackage ./core/vte { }; 243 245
+3 -3
pkgs/desktops/gnome-3/devtools/anjuta/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "anjuta-3.22.0"; 4 + name = "anjuta-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/anjuta/3.22/anjuta-3.22.0.tar.xz; 8 - sha256 = "4face1c063a5a6687a6cfc6f1f700ba15f13664633c05caa2fbf50317608dd03"; 7 + url = mirror://gnome/sources/anjuta/3.26/anjuta-3.26.0.tar.xz; 8 + sha256 = "fb895464c1a3c915bb2bb3ea5d236fd17202caa7205f6792f70a75affc343d70"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/devtools/devhelp/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "devhelp-3.24.0"; 4 + name = "devhelp-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/devhelp/3.24/devhelp-3.24.0.tar.xz; 8 - sha256 = "4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430"; 7 + url = mirror://gnome/sources/devhelp/3.26/devhelp-3.26.0.tar.xz; 8 + sha256 = "6bf2714f7f953b5858c643585383c4e4c8e9c65055527505abbf24fbf1ac8e38"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/devtools/gdl/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gdl-3.22.0"; 4 + name = "gdl-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gdl/3.22/gdl-3.22.0.tar.xz; 8 - sha256 = "cc5b360e1392292186924f0f9a8efc0f4db7e6e56dc7042037466b5cc839660c"; 7 + url = mirror://gnome/sources/gdl/3.26/gdl-3.26.0.tar.xz; 8 + sha256 = "f3ad03f9a34f751f52464e22d962c0dec8ff867b7b7b37fe24907f3dcd54c079"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/devtools/gnome-devel-docs/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-devel-docs-3.22.0"; 4 + name = "gnome-devel-docs-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-devel-docs/3.22/gnome-devel-docs-3.22.0.tar.xz; 8 - sha256 = "e0778c62670b1c19d45191ac5503568cbd09500e9e30015b48c19e95959e6d85"; 7 + url = mirror://gnome/sources/gnome-devel-docs/3.26/gnome-devel-docs-3.26.0.tar.xz; 8 + sha256 = "12eea77b550acfa617e14a89e4d24f93881294340abcc2c3abc7092c851703c3"; 9 9 }; 10 10 }
+2 -2
pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "gnome-shell-dash-to-dock-${version}"; 5 - version = "v60"; 5 + version = "v61"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "micheleg"; 9 9 repo = "dash-to-dock"; 10 10 rev = "extensions.gnome.org-" + version; 11 - sha256 = "0w9km1zcxcskrsfr392zx945k227qajnw09pxc20d1vwv78wlgy3"; 11 + sha256 = "152xzhal3wr40j0pv03v0gg20054n5hqqy3s10bkj2a0x830pgjk"; 12 12 }; 13 13 14 14 nativeBuildInputs = [
+3 -3
pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "gnome-shell-extension-topicons-plus-${version}"; 5 - version = "20"; 5 + version = "21"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "phocean"; 9 9 repo = "TopIcons-plus"; 10 - rev = "01535328bd43ecb3f2c71376de6fc8d1d8a88577"; 11 - sha256 = "0pwpg72ihgj2jl9pg63y0hibdsl27srr3mab881w0gh17vwyixzi"; 10 + rev = "v${version}"; 11 + sha256 = "15p61krd7lcmgr1d4s2ydfjy3pyq79pq5100xzy6dln1538901m3"; 12 12 }; 13 13 14 14 buildInputs = [ glib ];
+3 -3
pkgs/desktops/gnome-3/games/five-or-more/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "five-or-more-3.22.0"; 4 + name = "five-or-more-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/five-or-more/3.22/five-or-more-3.22.0.tar.xz; 8 - sha256 = "33c0ba7723144aea496112fa85a1d7e5a2a8ecaa32f4373471470d7c3078da94"; 7 + url = mirror://gnome/sources/five-or-more/3.26/five-or-more-3.26.0.tar.xz; 8 + sha256 = "7c24f7f2603df99299d38b40b14c005aaad88820113ed71e4b3765ac3b027772"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/games/gnome-chess/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-chess-3.24.1"; 4 + name = "gnome-chess-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-chess/3.24/gnome-chess-3.24.1.tar.xz; 8 - sha256 = "6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3"; 7 + url = mirror://gnome/sources/gnome-chess/3.26/gnome-chess-3.26.0.tar.xz; 8 + sha256 = "a0f6f862ab7067626a3a86cdc9c14dde595e38e6719e0198cb967e11facf1f12"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/games/gnome-klotski/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-klotski-3.22.0"; 4 + name = "gnome-klotski-3.22.2"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.0.tar.xz; 8 - sha256 = "25e35369d1b5d2f9e6b92d44568d21df631b5b23dd7b12ca226a04f58cb54700"; 7 + url = mirror://gnome/sources/gnome-klotski/3.22/gnome-klotski-3.22.2.tar.xz; 8 + sha256 = "16hd6yk01rhb4pj8m01fyn72wykf41d72gsms81q0n4zm5bm1a4h"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/games/gnome-mines/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-mines-3.24.0"; 4 + name = "gnome-mines-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-mines/3.24/gnome-mines-3.24.0.tar.xz; 8 - sha256 = "e663af29235a5c3f03d90f135487f57e5fd9137480dafb0ae9efc0da855602f6"; 7 + url = mirror://gnome/sources/gnome-mines/3.26/gnome-mines-3.26.0.tar.xz; 8 + sha256 = "2b041eaf0d57307498c56d8e285b2e539f634fdba95d689f6af75aa4ed6edde9"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/games/gnome-sudoku/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-sudoku-3.24.0"; 4 + name = "gnome-sudoku-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-sudoku/3.24/gnome-sudoku-3.24.0.tar.xz; 8 - sha256 = "04a29447889448ee5d5840cb5b2fd05ce6031c38a24809ce4919647ee6f485d7"; 7 + url = mirror://gnome/sources/gnome-sudoku/3.26/gnome-sudoku-3.26.0.tar.xz; 8 + sha256 = "8774c7093a97131b94d39142f1e044c8619cfdb6ad2546176271589fbb12d3a0"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/games/gnome-taquin/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-taquin-3.22.0"; 4 + name = "gnome-taquin-3.26.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-taquin/3.22/gnome-taquin-3.22.0.tar.xz; 8 - sha256 = "780af247856b91095a9a2e1a6b425e4e3a78520659e2157eddb421377e8ce982"; 7 + url = mirror://gnome/sources/gnome-taquin/3.26/gnome-taquin-3.26.1.tar.xz; 8 + sha256 = "de352bb2dfcd759de37f6bccf1e4790760e020b4bb06a1bc8d5f03d89613b6fd"; 9 9 }; 10 10 }
+1 -6
pkgs/desktops/gnome-3/games/hitori/default.nix
··· 2 2 , libxml2, intltool, itstool }: 3 3 4 4 stdenv.mkDerivation rec { 5 - name = "hitori-${gnome3.version}.1"; 6 - 7 - src = fetchurl { 8 - url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz"; 9 - sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1"; 10 - }; 5 + inherit (import ./src.nix fetchurl) name src; 11 6 12 7 nativeBuildInputs = [ pkgconfig ]; 13 8 buildInputs = [
+3 -3
pkgs/desktops/gnome-3/games/iagno/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "iagno-3.22.0"; 4 + name = "iagno-3.26.1"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/iagno/3.22/iagno-3.22.0.tar.xz; 8 - sha256 = "e7070c55f1f74cd9345388ee120f0e6cc47392868c2601664c26a0fa2672fe13"; 7 + url = mirror://gnome/sources/iagno/3.26/iagno-3.26.1.tar.xz; 8 + sha256 = "3476810d0c42aa1600484de2c111c94e0cf5247a98f071b23a0b5e3036362121"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/games/lightsoff/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "lightsoff-3.24.0"; 4 + name = "lightsoff-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/lightsoff/3.24/lightsoff-3.24.0.tar.xz; 8 - sha256 = "5d1bb7de4b3f5c7814e5599a5171cfdeef74e774a8a6dbd992c893a5af6bd8ce"; 7 + url = mirror://gnome/sources/lightsoff/3.26/lightsoff-3.26.0.tar.xz; 8 + sha256 = "d12572bc7b70481320ec90c6130ad794b559a9990d08bef158a1d826aaa35976"; 9 9 }; 10 10 }
+3 -3
pkgs/desktops/gnome-3/games/swell-foop/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "swell-foop-3.24.0"; 4 + name = "swell-foop-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/swell-foop/3.24/swell-foop-3.24.0.tar.xz; 8 - sha256 = "1b2d444e4d399e300afe07a243423c8b3ab1ca32828c749e0be9af48a5904a11"; 7 + url = mirror://gnome/sources/swell-foop/3.26/swell-foop-3.26.0.tar.xz; 8 + sha256 = "122e2b5a51ad0144ea6b5fd2736ac43b101c7892198948e697bfc4c014bbba22"; 9 9 }; 10 10 }
+5 -12
pkgs/desktops/gnome-3/misc/gitg/default.nix
··· 1 - { stdenv, fetchurl, fetchgit, vala_0_32, intltool, libgit2, pkgconfig, gtk3, glib 2 - , json_glib, webkitgtk, wrapGAppsHook, libpeas, bash, gobjectIntrospection 1 + { stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib 2 + , json_glib, wrapGAppsHook, libpeas, bash, gobjectIntrospection 3 3 , gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg, libsecret 4 - , dconf}: 5 - 6 - 7 - # TODO: icons and theme still does not work 8 - # use packaged gnome3.adwaita-icon-theme 4 + , libsoup }: 9 5 10 6 stdenv.mkDerivation rec { 11 7 inherit (import ./src.nix fetchurl) name src; ··· 20 16 propagatedUserEnvPkgs = [ shared_mime_info 21 17 gnome3.gnome_themes_standard ]; 22 18 23 - buildInputs = [ vala_0_32 libgit2 gtk3 glib json_glib webkitgtk libgee libpeas 19 + buildInputs = [ gtk3 glib json_glib libgee libpeas gnome3.libsoup 24 20 libgit2-glib gtkspell3 gnome3.gtksourceview gnome3.gsettings_desktop_schemas 25 21 librsvg libsecret gobjectIntrospection gnome3.adwaita-icon-theme ]; 26 22 27 - nativeBuildInputs = [ wrapGAppsHook intltool pkgconfig ]; 28 - 29 - # https://bugzilla.gnome.org/show_bug.cgi?id=758240 30 - preBuild = ''make -j$NIX_BUILD_CORES Gitg-1.0.gir''; 23 + nativeBuildInputs = [ vala wrapGAppsHook intltool pkgconfig ]; 31 24 32 25 meta = with stdenv.lib; { 33 26 homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
+6 -4
pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, gnome3, libxslt, packagekit 2 - , fontconfig, libcanberra_gtk3, libnotify, wrapGAppsHook, dbus_glib, dbus_libs }: 1 + { stdenv, fetchurl, pkgconfig, meson, ninja, gettext, gnome3, libxslt, packagekit, polkit 2 + , fontconfig, libcanberra_gtk3, systemd, libnotify, wrapGAppsHook, dbus_glib, dbus_libs, desktop_file_utils }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 inherit (import ./src.nix fetchurl) name src; 6 6 7 7 NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0"; 8 8 9 - nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; 10 - buildInputs = [ libxslt gnome3.gtk packagekit fontconfig 9 + nativeBuildInputs = [ pkgconfig meson ninja gettext wrapGAppsHook desktop_file_utils ]; 10 + buildInputs = [ libxslt gnome3.gtk packagekit fontconfig systemd polkit 11 11 libcanberra_gtk3 libnotify dbus_glib dbus_libs ]; 12 + 13 + prePatch = "patchShebangs meson_post_install.sh"; 12 14 13 15 meta = with stdenv.lib; { 14 16 homepage = https://www.freedesktop.org/software/PackageKit/;
+3 -3
pkgs/desktops/gnome-3/misc/gnome-packagekit/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-packagekit-3.24.0"; 4 + name = "gnome-packagekit-3.26.0"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-packagekit/3.24/gnome-packagekit-3.24.0.tar.xz; 8 - sha256 = "8d038681f6879c93f3f58faaa37c41c7ac8cf53eba6b8cb871f5f683ac0bd13f"; 7 + url = mirror://gnome/sources/gnome-packagekit/3.26/gnome-packagekit-3.26.0.tar.xz; 8 + sha256 = "6a219e16923d3976f424416c944bef06913922da24bc9e6644ec114c2d563417"; 9 9 }; 10 10 }
+13 -39
pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
··· 1 - From ac9e8e835888da1faa57f07c54fa4e73783621e2 Mon Sep 17 00:00:00 2001 1 + From f7f7fe6bf36ca08c66192077bf964036eb02ffb5 Mon Sep 17 00:00:00 2001 2 2 From: Jascha Geerds <jascha@jgeerds.name> 3 - Date: Sun, 25 Jun 2017 11:32:30 +0100 3 + Date: Tue, 19 Sep 2017 03:08:07 +0200 4 4 Subject: [PATCH 1/3] Search for themes and icons in system data dirs 5 5 6 6 --- 7 - gtweak/tweaks/tweak_group_interface.py | 17 ++++------------- 8 - gtweak/tweaks/tweak_group_keymouse.py | 7 ++----- 9 - gtweak/utils.py | 17 +++++++++++++++++ 10 - 3 files changed, 23 insertions(+), 18 deletions(-) 7 + gtweak/tweaks/tweak_group_appearance.py | 17 ++++------------- 8 + gtweak/utils.py | 17 +++++++++++++++++ 9 + 2 files changed, 21 insertions(+), 13 deletions(-) 11 10 12 - diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py 13 - index 97751ed..db89b85 100644 14 - --- a/gtweak/tweaks/tweak_group_interface.py 15 - +++ b/gtweak/tweaks/tweak_group_interface.py 11 + diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py 12 + index ccadefc..0d12194 100644 13 + --- a/gtweak/tweaks/tweak_group_appearance.py 14 + +++ b/gtweak/tweaks/tweak_group_appearance.py 16 15 @@ -26,7 +26,7 @@ from gi.repository import Gtk 17 16 from gi.repository import GLib 18 17 19 18 import gtweak 20 19 -from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file 21 20 +from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs 22 - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE 21 + from gtweak.tweakmodel import Tweak 23 22 from gtweak.gshellwrapper import GnomeShellFactory 24 23 from gtweak.gsettings import GSettingsSetting 25 24 @@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): ··· 58 57 os.path.isdir(d) and \ 59 58 os.path.exists(os.path.join(d, "cursors"))) 60 59 return valid 61 - diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py 62 - index 69c4b7e..b06900c 100644 63 - --- a/gtweak/tweaks/tweak_group_keymouse.py 64 - +++ b/gtweak/tweaks/tweak_group_keymouse.py 65 - @@ -21,7 +21,7 @@ from gi.repository import GLib 66 - 67 - import gtweak 68 - from gtweak.gshellwrapper import GnomeShellFactory 69 - -from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default 70 - +from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs 71 - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak 72 - 73 - _shell = GnomeShellFactory().get_shell() 74 - @@ -41,10 +41,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): 75 - **options) 76 - 77 - def _get_valid_key_themes(self): 78 - - dirs = ( os.path.join(gtweak.DATA_DIR, "themes"), 79 - - os.path.join(GLib.get_user_data_dir(), "themes"), 80 - - os.path.join(os.path.expanduser("~"), ".themes")) 81 - - valid = walk_directories(dirs, lambda d: 82 - + valid = walk_directories(get_resource_dirs("themes"), lambda d: 83 - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ 84 - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) 85 - return valid 86 60 diff --git a/gtweak/utils.py b/gtweak/utils.py 87 - index 39f8833..b0993b6 100644 61 + index de6c345..6c60b88 100644 88 62 --- a/gtweak/utils.py 89 63 +++ b/gtweak/utils.py 90 64 @@ -21,6 +21,7 @@ import tempfile ··· 95 69 96 70 import gtweak 97 71 from gtweak.gsettings import GSettingsSetting 98 - @@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, block=True): 72 + @@ -117,6 +118,22 @@ def execute_subprocess(cmd_then_args, block=True): 99 73 stdout, stderr = p.communicate() 100 74 return stdout, stderr, p.returncode 101 75 ··· 119 93 class AutostartManager: 120 94 121 95 -- 122 - 2.12.2 96 + 2.14.1 123 97
+13 -36
pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
··· 1 - From 25c047ac6a2ac892e2be3d7e002fbf7a16725a4c Mon Sep 17 00:00:00 2001 1 + From 8e75fe5f1ebd8a140a7306294d2219aea4ac47d2 Mon Sep 17 00:00:00 2001 2 2 From: Jascha Geerds <jascha@jgeerds.name> 3 - Date: Sun, 25 Jun 2017 11:35:10 +0100 3 + Date: Tue, 19 Sep 2017 03:16:07 +0200 4 4 Subject: [PATCH 2/3] Don't show multiple entries for a single theme 5 5 6 6 --- 7 - gtweak/tweaks/tweak_group_interface.py | 8 ++++---- 8 - gtweak/tweaks/tweak_group_keymouse.py | 4 ++-- 9 - gtweak/utils.py | 16 ++++++++++++++++ 10 - 3 files changed, 22 insertions(+), 6 deletions(-) 7 + gtweak/tweaks/tweak_group_appearance.py | 8 ++++---- 8 + gtweak/utils.py | 16 ++++++++++++++++ 9 + 2 files changed, 20 insertions(+), 4 deletions(-) 11 10 12 - diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py 13 - index db89b85..4697fe3 100644 14 - --- a/gtweak/tweaks/tweak_group_interface.py 15 - +++ b/gtweak/tweaks/tweak_group_interface.py 11 + diff --git a/gtweak/tweaks/tweak_group_appearance.py b/gtweak/tweaks/tweak_group_appearance.py 12 + index 0d12194..8e05077 100644 13 + --- a/gtweak/tweaks/tweak_group_appearance.py 14 + +++ b/gtweak/tweaks/tweak_group_appearance.py 16 15 @@ -26,7 +26,7 @@ from gi.repository import Gtk 17 16 from gi.repository import GLib 18 17 19 18 import gtweak 20 19 -from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs 21 20 +from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources 22 - from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE 21 + from gtweak.tweakmodel import Tweak 23 22 from gtweak.gshellwrapper import GnomeShellFactory 24 23 from gtweak.gsettings import GSettingsSetting 25 24 @@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTweak): ··· 49 48 50 49 class ShellThemeTweak(Gtk.Box, Tweak): 51 50 52 - diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py 53 - index b06900c..d34793e 100644 54 - --- a/gtweak/tweaks/tweak_group_keymouse.py 55 - +++ b/gtweak/tweaks/tweak_group_keymouse.py 56 - @@ -21,7 +21,7 @@ from gi.repository import GLib 57 - 58 - import gtweak 59 - from gtweak.gshellwrapper import GnomeShellFactory 60 - -from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs 61 - +from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources 62 - from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak 63 - 64 - _shell = GnomeShellFactory().get_shell() 65 - @@ -44,7 +44,7 @@ class KeyThemeSwitcher(GSettingsComboTweak): 66 - valid = walk_directories(get_resource_dirs("themes"), lambda d: 67 - os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \ 68 - os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc"))) 69 - - return valid 70 - + return get_unique_resources(valid) 71 - 72 - TWEAK_GROUPS = [ 73 - ListBoxTweakGroup(_("Keyboard and Mouse"), 74 51 diff --git a/gtweak/utils.py b/gtweak/utils.py 75 - index b0993b6..0d995bc 100644 52 + index 6c60b88..6fd7c6a 100644 76 53 --- a/gtweak/utils.py 77 54 +++ b/gtweak/utils.py 78 - @@ -133,6 +133,22 @@ def get_resource_dirs(resource): 55 + @@ -134,6 +134,22 @@ def get_resource_dirs(resource): 79 56 80 57 return [dir for dir in dirs if os.path.isdir(dir)] 81 58 ··· 99 76 class AutostartManager: 100 77 101 78 -- 102 - 2.12.2 79 + 2.14.1 103 80
+4 -4
pkgs/desktops/gnome-3/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
··· 1 - From ba2eb4be6c69ee8206e0139268c896e6a2b278d8 Mon Sep 17 00:00:00 2001 1 + From 6a6a7d1c708a2f568277699c5b605fa03ccb5faa Mon Sep 17 00:00:00 2001 2 2 From: Jascha Geerds <jascha@jgeerds.name> 3 - Date: Sun, 25 Jun 2017 11:50:33 +0100 3 + Date: Tue, 19 Sep 2017 03:17:20 +0200 4 4 Subject: [PATCH 3/3] Create config dir if it doesn't exist 5 5 6 6 --- ··· 8 8 1 file changed, 4 insertions(+) 9 9 10 10 diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py 11 - index a0c163b..f5883ec 100644 11 + index a11363b..2871c49 100644 12 12 --- a/gtweak/gtksettings.py 13 13 +++ b/gtweak/gtksettings.py 14 14 @@ -36,6 +36,10 @@ class GtkSettingsManager: ··· 23 23 keyfile.load_from_file(self._path, 0) 24 24 except MemoryError: 25 25 -- 26 - 2.12.2 26 + 2.14.1 27 27
+13 -10
pkgs/desktops/gnome-3/misc/gnome-tweak-tool/default.nix
··· 1 - { stdenv, intltool, fetchurl, atk 1 + { stdenv, meson, ninja, gettext, fetchurl, atk 2 2 , pkgconfig, gtk3, glib, libsoup 3 - , bash, itstool, libxml2, python2Packages 3 + , bash, itstool, libxml2, python3Packages 4 4 , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }: 5 5 6 6 stdenv.mkDerivation rec { ··· 8 8 9 9 doCheck = true; 10 10 11 - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 11 + checkPhase = "meson test"; 12 12 13 - makeFlags = [ "DESTDIR=/" ]; 13 + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; 14 14 15 - nativeBuildInputs = [ pkgconfig ]; 16 - buildInputs = [ gtk3 glib intltool itstool libxml2 17 - gnome3.gsettings_desktop_schemas file 15 + nativeBuildInputs = [ meson ninja pkgconfig gettext itstool libxml2 file wrapGAppsHook ]; 16 + buildInputs = [ gtk3 glib gnome3.gsettings_desktop_schemas 18 17 gdk_pixbuf gnome3.defaultIconTheme librsvg 19 - libnotify gnome3.gnome_shell python2Packages.pygobject3 18 + libnotify gnome3.gnome_shell python3Packages.pygobject3 20 19 libsoup gnome3.gnome_settings_daemon gnome3.nautilus 21 - gnome3.gnome_desktop wrapGAppsHook gobjectIntrospection 20 + gnome3.gnome_desktop gobjectIntrospection 22 21 ]; 23 22 23 + postPatch = '' 24 + patchShebangs meson-postinstall.py 25 + ''; 26 + 24 27 preFixup = '' 25 28 gappsWrapperArgs+=( 26 - --prefix PYTHONPATH : "$out/${python2Packages.python.sitePackages}:$PYTHONPATH") 29 + --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}:$PYTHONPATH") 27 30 ''; 28 31 29 32 patches = [
+3 -3
pkgs/desktops/gnome-3/misc/gnome-tweak-tool/src.nix
··· 1 1 # Autogenerated by maintainers/scripts/gnome.sh update 2 2 3 3 fetchurl: { 4 - name = "gnome-tweak-tool-3.24.1"; 4 + name = "gnome-tweak-tool-3.26.3"; 5 5 6 6 src = fetchurl { 7 - url = mirror://gnome/sources/gnome-tweak-tool/3.24/gnome-tweak-tool-3.24.1.tar.xz; 8 - sha256 = "19226b374148d660330af9a8341087c2f869bb24355f4dcc87857169eca9f565"; 7 + url = mirror://gnome/sources/gnome-tweak-tool/3.26/gnome-tweak-tool-3.26.3.tar.xz; 8 + sha256 = "9406447850b14de204f9c5a6eaa6b63ba805ddb1a10fd863239841090af76430"; 9 9 }; 10 10 }
+2 -2
pkgs/desktops/gnome-3/misc/gpaste/default.nix
··· 2 2 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, wrapGAppsHook, systemd, gobjectIntrospection }: 3 3 4 4 stdenv.mkDerivation rec { 5 - version = "3.24.2"; 5 + version = "3.26.0"; 6 6 name = "gpaste-${version}"; 7 7 8 8 src = fetchurl { 9 9 url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; 10 - sha256 = "16142jfpkz8qfs7zp9k3c5l9pnvxbr5yygj8jdpx6by1142s6340"; 10 + sha256 = "0xlcbm9qnw61h6xwa1c0lz5mp1ca3vjjn5wpk0ahhhl6k94mzjs7"; 11 11 }; 12 12 13 13 nativeBuildInputs = [ autoreconfHook pkgconfig vala wrapGAppsHook ];
+2 -2
pkgs/desktops/gnome-3/misc/libgames-support/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, intltool }: 2 2 3 3 stdenv.mkDerivation rec { 4 - version = "1.2.1"; 4 + version = "1.2.3"; 5 5 name = "libgnome-games-support-${version}"; 6 6 7 7 src = fetchurl { 8 8 url = "mirror://gnome/sources/libgnome-games-support/1.2/${name}.tar.xz"; 9 - sha256 = "1rsyf5hbjim7zpk1yar3gv65g1nmw6zbbc0smrmxsfk0f9n3j9m6"; 9 + sha256 = "1vwad7kqy7yd6wqyr71nq0blh7m53r3lz6ya16dmh942kd0w48v1"; 10 10 }; 11 11 12 12 nativeBuildInputs = [ pkgconfig ];
+1 -1
pkgs/desktops/gnome-3/misc/libgda/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: 1 + { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 inherit (import ./src.nix fetchurl) name src;
+6 -1
pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix
··· 8 8 gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection 9 9 ]; 10 10 11 - buildInputs = [ libssh2 libgit2 glib ]; 11 + propagatedBuildInputs = [ 12 + # Required by libgit2-glib-1.0.pc 13 + libgit2 glib 14 + ]; 15 + 16 + buildInputs = [ libssh2 ]; 12 17 13 18 meta = with stdenv.lib; { 14 19 platforms = platforms.linux;
+5 -5
pkgs/desktops/gnome-3/misc/pomodoro/default.nix
··· 1 1 { stdenv, fetchFromGitHub, autoconf-archive, appstream-glib, intltool, pkgconfig, libtool, wrapGAppsHook, 2 - dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_34, gnome3, gtk3, 2 + dbus_glib, libcanberra_gtk2, gst_all_1, vala, gnome3, gtk3, libxml2, 3 3 glib, gobjectIntrospection, libpeas 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { 7 - version = "0.13.3"; 7 + version = "0.13.4"; 8 8 name = "gnome-shell-pomodoro-${version}"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "codito"; 12 12 repo = "gnome-pomodoro"; 13 13 rev = "${version}"; 14 - sha256 = "1hi4mdzyz2f8k19bkfzrrnavsbkr621w0bfpza8ij2yccpxz81h2"; 14 + sha256 = "0fiql99nhj168wbfhvzrhfcm4c4569gikd2zaf10vzszdqjahrl1"; 15 15 }; 16 16 17 17 configureScript = "./autogen.sh"; 18 18 19 19 nativeBuildInputs = [ 20 20 autoconf-archive libtool intltool appstream-glib 21 - wrapGAppsHook pkgconfig 21 + wrapGAppsHook pkgconfig libxml2 22 22 ]; 23 23 24 24 buildInputs = [ 25 25 glib gobjectIntrospection libpeas 26 - dbus_glib libcanberra_gtk2 vala_0_34 gst_all_1.gstreamer 26 + dbus_glib libcanberra_gtk2 vala gst_all_1.gstreamer 27 27 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good 28 28 gnome3.gsettings_desktop_schemas 29 29 gnome3.gnome_common gnome3.gnome_shell gtk3
+6 -5
pkgs/desktops/pantheon/apps/pantheon-terminal/default.nix
··· 1 - { stdenv, fetchurl, perl, cmake, vala_0_23, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }: 1 + { stdenv, fetchurl, perl, cmake, vala_0_38, pkgconfig, glib, gtk3, granite, gnome3, libnotify, gettext, makeWrapper }: 2 2 3 3 stdenv.mkDerivation rec { 4 - majorVersion = "0.3"; 5 - minorVersion = "1.3"; 4 + majorVersion = "0.4"; 5 + minorVersion = "3"; 6 6 name = "pantheon-terminal-${majorVersion}.${minorVersion}"; 7 7 src = fetchurl { 8 8 url = "https://launchpad.net/pantheon-terminal/${majorVersion}.x/${majorVersion}.${minorVersion}/+download/${name}.tgz"; ··· 20 20 done 21 21 ''; 22 22 23 + nativeBuildInputs = [ perl cmake vala_0_38 pkgconfig makeWrapper ]; 23 24 buildInputs = with gnome3; [ 24 - perl cmake vala_0_23 pkgconfig glib gtk3 granite libnotify gettext makeWrapper 25 - vte_290 libgee gsettings_desktop_schemas defaultIconTheme 25 + glib gtk3 granite libnotify gettext vte_290 libgee 26 + gsettings_desktop_schemas defaultIconTheme 26 27 ]; 27 28 meta = { 28 29 description = "Elementary OS's terminal";
+1 -1
pkgs/development/compilers/vala/default.nix
··· 67 67 extraBuildInputs = [ graphviz ]; 68 68 }; 69 69 70 - vala = vala_0_34; 70 + vala = vala_0_38; 71 71 }
-18
pkgs/development/libraries/giflib/5.0.nix
··· 1 - {stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }: 2 - 3 - stdenv.mkDerivation { 4 - name = "giflib-5.0.6"; 5 - src = fetchurl { 6 - url = mirror://sourceforge/giflib/giflib-5.0.6.tar.bz2; 7 - sha256 = "1sk9ysh27nabwb6z7a38n8gy2y2rnl3vjkbapv7pbjnzrff862c9"; 8 - }; 9 - 10 - buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; 11 - meta = { 12 - description = "A library for reading and writing gif images"; 13 - platforms = stdenv.lib.platforms.unix; 14 - license = stdenv.lib.licenses.mit; 15 - maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; 16 - branch = "5.0"; 17 - }; 18 - }
+2 -2
pkgs/development/libraries/granite/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 majorVersion = "0.4"; 5 - minorVersion = "0.1"; 5 + minorVersion = "1"; 6 6 name = "granite-${majorVersion}.${minorVersion}"; 7 7 src = fetchurl { 8 8 url = "https://launchpad.net/granite/${majorVersion}/${majorVersion}.${minorVersion}/+download/${name}.tar.xz"; 9 - sha256 = "1pf4jkz3xyn1sqv70063im80ayb5kdsqwqwx11dc7vgypsl458cm"; 9 + sha256 = "177h5h1q4qd7g99mzbczvz78j8c9jf4f1gwdj9f6imbc7r913d4b"; 10 10 }; 11 11 cmakeFlags = "-DINTROSPECTION_GIRDIR=share/gir-1.0/ -DINTROSPECTION_TYPELIBDIR=lib/girepository-1.0"; 12 12 nativeBuildInputs = [ pkgconfig ];
+2 -2
pkgs/development/libraries/gvfs/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, intltool, libtool 2 2 , glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit 3 3 , libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma 4 - , libxml2, libxslt, docbook_xsl, samba, libmtp 4 + , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp 5 5 , gnomeSupport ? false, gnome, makeWrapper }: 6 6 7 7 let ··· 18 18 19 19 nativeBuildInputs = [ 20 20 pkgconfig intltool libtool file makeWrapper 21 - libxml2 libxslt docbook_xsl 21 + libxml2 libxslt docbook_xsl docbook_xml_dtd_42 22 22 ]; 23 23 24 24 buildInputs =
+2 -2
pkgs/development/libraries/libsecret/default.nix
··· 1 1 { stdenv, fetchurl, glib, pkgconfig, intltool, libxslt, docbook_xsl, gtk_doc 2 - , libgcrypt, gobjectIntrospection, vala_0_32 }: 2 + , libgcrypt, gobjectIntrospection, vala_0_38 }: 3 3 let 4 4 version = "0.18.5"; 5 5 in ··· 17 17 18 18 propagatedBuildInputs = [ glib ]; 19 19 nativeBuildInputs = [ pkgconfig intltool libxslt docbook_xsl ]; 20 - buildInputs = [ libgcrypt gobjectIntrospection vala_0_32 ]; 20 + buildInputs = [ libgcrypt gobjectIntrospection vala_0_38 ]; 21 21 # optional: build docs with gtk-doc? (probably needs a flag as well) 22 22 23 23 meta = {
+2 -2
pkgs/development/libraries/libsoup/default.nix
··· 1 1 { stdenv, fetchurl, glib, libxml2, pkgconfig 2 2 , gnomeSupport ? true, libgnome_keyring3, sqlite, glib_networking, gobjectIntrospection 3 - , valaSupport ? true, vala_0_32 3 + , valaSupport ? true, vala_0_38 4 4 , libintlOrEmpty 5 5 , intltool, python }: 6 6 let ··· 25 25 outputs = [ "out" "dev" ]; 26 26 27 27 buildInputs = libintlOrEmpty ++ [ intltool python sqlite ] 28 - ++ stdenv.lib.optionals valaSupport [ vala_0_32 ]; 28 + ++ stdenv.lib.optionals valaSupport [ vala_0_38 ]; 29 29 nativeBuildInputs = [ pkgconfig ]; 30 30 propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ] 31 31 ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring3 ];
-2
pkgs/development/libraries/zeitgeist/default.nix
··· 14 14 sha256 = "0vw6m0azycqabbz8f0fd8xsh5kf6j3ig4wpqlhw6sklvf44ii5b8"; 15 15 }; 16 16 17 - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; 18 - 19 17 configureScript = "./autogen.sh"; 20 18 21 19 configureFlags = [ "--with-session-bus-services-dir=$(out)/share/dbus-1/services" ];
+8 -2
pkgs/tools/misc/colord/default.nix
··· 1 1 { stdenv, fetchurl, bash-completion 2 2 , glib, polkit, pkgconfig, gettext, gusb, lcms2, sqlite, systemd, dbus 3 3 , gobjectIntrospection, argyllcms, meson, ninja, libxml2, vala_0_38 4 - , libgudev, sane-backends }: 4 + , libgudev, sane-backends, udev, gnome3, makeWrapper }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 name = "colord-1.4.1"; ··· 27 27 ./fix-build-paths.patch 28 28 ]; 29 29 30 - nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection ]; 30 + nativeBuildInputs = [ meson pkgconfig vala_0_38 ninja gettext libxml2 gobjectIntrospection makeWrapper ]; 31 31 32 32 buildInputs = [ glib polkit gusb lcms2 sqlite systemd dbus 33 33 bash-completion argyllcms libgudev sane-backends ]; 34 34 35 35 postInstall = '' 36 36 glib-compile-schemas $out/share/glib-2.0/schemas 37 + ''; 38 + 39 + postFixup = '' 40 + wrapProgram "$out/libexec/colord-session" \ 41 + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" \ 42 + --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib gnome3.dconf}/lib/gio/modules" 37 43 ''; 38 44 39 45 meta = {
+18
pkgs/tools/misc/colord/fix-build-paths.patch
··· 36 36 ) 37 37 endif 38 38 39 + @@ -50,5 +50,5 @@ 40 + output : 'org.freedesktop.ColorManager.conf', 41 + configuration : con2, 42 + install: true, 43 + - install_dir: join_paths(get_option('datadir'), 'dbus-1', 'system.d') , 44 + + install_dir: join_paths(get_option('prefix'), 'etc', 'dbus-1', 'system.d') , 45 + ) 39 46 --- a/meson.build 40 47 +++ b/meson.build 41 48 @@ -258,6 +258,3 @@ ··· 54 61 - install_dir : join_paths(udev.get_pkgconfig_variable('udevdir'), 'rules.d') 55 62 + install_dir : join_paths(get_option('prefix'), 'lib', 'udev', 'rules.d') 56 63 ) 64 + --- a/src/plugins/meson.build 65 + +++ b/src/plugins/meson.build 66 + @@ -66,7 +66,7 @@ 67 + install_dir: join_paths(get_option('libdir'), 'colord-plugins'), 68 + c_args : [ 69 + cargs, 70 + - '-DCOLORD_SANE_BINARY="' + join_paths(get_option('libexecdir'), 'colord-sane' + '"'), 71 + + '-DCOLORD_SANE_BINARY="' + join_paths(get_option('prefix'), get_option('libexecdir'), 'colord-sane' + '"'), 72 + ], 73 + dependencies : [ 74 + gio,
+2 -3
pkgs/top-level/all-packages.nix
··· 9683 9683 9684 9684 giflib = giflib_5_1; 9685 9685 giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; 9686 - giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { }; 9687 9686 giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; 9688 9687 9689 9688 libungif = callPackage ../development/libraries/giflib/libungif.nix { }; ··· 16905 16904 }; 16906 16905 16907 16906 deepin-terminal = callPackage ../applications/misc/deepin-terminal { 16908 - vte = gnome3.vte; 16907 + inherit (gnome3) libgee vte; 16909 16908 wnck = libwnck3; 16910 - gee = libgee_0_8; 16909 + vala = vala_0_34; 16911 16910 }; 16912 16911 16913 16912 termite = callPackage ../applications/misc/termite {