Skip to content
Permalink

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9f35c7edcb26^
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 87625d30d09d
Choose a head ref

Commits on Mar 5, 2019

  1. glib: 2.58.2 -> 2.60.0

    - The gettext dir has moved for some reason
    - `install_dir : bin` fix is now upstream
    hedning committed Mar 5, 2019
    Copy the full SHA
    9f35c7e View commit details
  2. Copy the full SHA
    c9dd3d9 View commit details
  3. gdk-pixbuf: 2.38.0 -> 2.38.1

    hedning committed Mar 5, 2019
    Copy the full SHA
    1781ab9 View commit details
  4. Copy the full SHA
    e99150d View commit details
  5. atk: 2.30.0 -> 2.31.92

    hedning committed Mar 5, 2019
    Copy the full SHA
    43f732d View commit details
  6. Copy the full SHA
    089cfe3 View commit details
  7. vte: 0.54.3 -> 0.55.92

    hedning committed Mar 5, 2019
    Copy the full SHA
    e89f64c View commit details
  8. libsoup: 2.64.2 -> 2.65.91

    hedning committed Mar 5, 2019
    Copy the full SHA
    648d44b View commit details
  9. librsvg: 2.44.12 -> 2.45.5

    hedning committed Mar 5, 2019
    Copy the full SHA
    f1c050f View commit details
  10. Copy the full SHA
    92aa8ad View commit details
  11. libgtop: 2.38.0 -> 2.39.91

    hedning committed Mar 5, 2019
    Copy the full SHA
    3a97fcb View commit details
  12. libdazzle: 3.30.2 -> 3.31.90

    hedning committed Mar 5, 2019
    Copy the full SHA
    3114e2d View commit details
  13. libchamplain: 0.12.16 -> 0.12.19

    Port to meson
    hedning committed Mar 5, 2019
    Copy the full SHA
    325435a View commit details
  14. gvfs: 1.38.1 -> 1.39.92

    `codegen.py` no longer exists
    hedning committed Mar 5, 2019
    Copy the full SHA
    a6d49fe View commit details
  15. gexiv2: 0.10.10 -> 0.11.0

    hedning committed Mar 5, 2019
    Copy the full SHA
    69d7f57 View commit details
  16. gnome3.tracker: 2.1.6 -> 2.2.0

    - move patch to file
    - turn on docs (they're turned off by default now)
    hedning committed Mar 5, 2019
    Copy the full SHA
    be2b9b1 View commit details
  17. gnome3.tracker-miners: 2.1.5 -> 2.2.0

    - update patch: meson.build now mostly get the stuff from pkgconfig
    hedning committed Mar 5, 2019
    Copy the full SHA
    d30ff8e View commit details
  18. Copy the full SHA
    3367f16 View commit details
  19. Copy the full SHA
    3c7cf26 View commit details
  20. Copy the full SHA
    53f56a7 View commit details
  21. webkitgtk: 2.22.7 -> 2.23.91

    Add new dependency `openjpeg`
    hedning committed Mar 5, 2019
    Copy the full SHA
    82cace0 View commit details
  22. Copy the full SHA
    1f14498 View commit details

Commits on Mar 6, 2019

  1. evince: 3.30.2 -> 3.31.91

    - pruneLibtoolFiles is now on by default
    - build now require appstream to generate some data
    - upstream has switched from intltool to gettext
    hedning committed Mar 6, 2019
    Copy the full SHA
    9854ce8 View commit details
  2. Copy the full SHA
    ba32e3b View commit details
  3. baobab: 3.30.0 -> 3.31.1

    hedning committed Mar 6, 2019
    Copy the full SHA
    5e7dd5c View commit details
  4. gnome3.dconf: 0.30.1 -> 0.31.2

    New integration test fails, so disabled for now.
    hedning committed Mar 6, 2019
    Copy the full SHA
    af99b6d View commit details
  5. Copy the full SHA
    05b79cb View commit details
  6. Copy the full SHA
    3562acd View commit details
  7. Copy the full SHA
    1e08d0b View commit details
  8. Copy the full SHA
    b9da384 View commit details
  9. Copy the full SHA
    191618c View commit details
  10. gnome3.gnome-calculator: 3.30.1 -> 3.31.91

    Now require `gtksourceview4` instead of 3.
    hedning committed Mar 6, 2019
    Copy the full SHA
    97b6552 View commit details
  11. Copy the full SHA
    ab2b188 View commit details
  12. gnome3.gnome-control-center: 3.30.3 -> 3.31.92

    - update patch
    - add new depeendencies: udisks2, gsound
    hedning committed Mar 6, 2019
    Copy the full SHA
    9503911 View commit details
  13. Copy the full SHA
    11efab3 View commit details
  14. Copy the full SHA
    7e8e3f4 View commit details
  15. Copy the full SHA
    2d07426 View commit details
  16. Copy the full SHA
    93d2464 View commit details
  17. Copy the full SHA
    c581e0b View commit details
  18. Copy the full SHA
    231d962 View commit details
  19. Copy the full SHA
    0737e5b View commit details
  20. Copy the full SHA
    267e44f View commit details
  21. gnome3.gnome-software: 3.30.6 -> 3.31.90

    Add new dependencies libxmlb and gnome-online-accounts
    hedning committed Mar 6, 2019
    Copy the full SHA
    0a531d7 View commit details
  22. Copy the full SHA
    6a41df4 View commit details
  23. Copy the full SHA
    dcd7648 View commit details
  24. Copy the full SHA
    4bb7656 View commit details
  25. gnome3.mutter: 3.30.2 -> 3.31.91

    - port to meson
    - the new meson build doesn't compile schemas
    hedning committed Mar 6, 2019
    Copy the full SHA
    ff42985 View commit details
  26. gnome3.nautilus: 3.30.5 -> 3.31.90

    - update thumbnail patch, similar to gnome-desktop, but no font cache issue
    hedning committed Mar 6, 2019
    Copy the full SHA
    edbcfbc View commit details
  27. Copy the full SHA
    e6cacf3 View commit details
  28. gnome3.sushi: 3.30.0 -> 3.31.2

    - port to meson
    - replace intltool with gettext
    - remove no longer leaky dependencies
    hedning committed Mar 6, 2019
    Copy the full SHA
    e832cc2 View commit details
Showing with 392 additions and 387 deletions.
  1. +2 −11 pkgs/applications/audio/rhythmbox/default.nix
  2. +2 −2 pkgs/applications/misc/orca/default.nix
  3. +2 −2 pkgs/desktops/gnome-3/apps/accerciser/default.nix
  4. +2 −2 pkgs/desktops/gnome-3/apps/cheese/default.nix
  5. +2 −2 pkgs/desktops/gnome-3/apps/evolution/default.nix
  6. +2 −2 pkgs/desktops/gnome-3/apps/file-roller/default.nix
  7. +15 −0 pkgs/desktops/gnome-3/apps/gedit/block-update-desktop.patch
  8. +29 −9 pkgs/desktops/gnome-3/apps/gedit/default.nix
  9. +4 −4 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
  10. +2 −2 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
  11. +2 −2 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
  12. +6 −11 pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
  13. +2 −2 pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix
  14. +2 −2 pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
  15. +2 −2 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
  16. +2 −2 pkgs/desktops/gnome-3/apps/gnome-music/default.nix
  17. +2 −2 pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
  18. +16 −4 pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
  19. +15 −10 pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
  20. +7 −12 pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
  21. +2 −2 pkgs/desktops/gnome-3/apps/polari/default.nix
  22. +4 −4 pkgs/desktops/gnome-3/apps/seahorse/default.nix
  23. +2 −2 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
  24. +2 −2 pkgs/desktops/gnome-3/core/baobab/default.nix
  25. +2 −2 pkgs/desktops/gnome-3/core/dconf-editor/default.nix
  26. +3 −3 pkgs/desktops/gnome-3/core/dconf/default.nix
  27. +2 −2 pkgs/desktops/gnome-3/core/eog/default.nix
  28. +2 −2 pkgs/desktops/gnome-3/core/epiphany/default.nix
  29. +7 −5 pkgs/desktops/gnome-3/core/evince/default.nix
  30. +2 −2 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
  31. +2 −2 pkgs/desktops/gnome-3/core/gdm/default.nix
  32. +2 −2 pkgs/desktops/gnome-3/core/gjs/default.nix
  33. +2 −2 pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix
  34. +2 −2 pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
  35. +4 −4 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
  36. +4 −4 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
  37. +6 −3 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
  38. +6 −4 pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch
  39. +10 −7 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
  40. +2 −2 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
  41. +2 −2 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix
  42. +2 −2 pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix
  43. +2 −2 pkgs/desktops/gnome-3/core/gnome-session/default.nix
  44. +2 −2 pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix
  45. +2 −2 pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix
  46. +5 −17 pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch
  47. +2 −2 pkgs/desktops/gnome-3/core/gnome-shell/default.nix
  48. +4 −4 pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch
  49. +4 −3 pkgs/desktops/gnome-3/core/gnome-software/default.nix
  50. +2 −2 pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
  51. +2 −2 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix
  52. +2 −2 pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix
  53. +16 −5 pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix
  54. +31 −28 pkgs/desktops/gnome-3/core/mutter/default.nix
  55. +5 −10 pkgs/desktops/gnome-3/core/nautilus/bubblewrap-paths.patch
  56. +2 −2 pkgs/desktops/gnome-3/core/nautilus/default.nix
  57. +2 −2 pkgs/desktops/gnome-3/core/simple-scan/default.nix
  58. +8 −8 pkgs/desktops/gnome-3/core/sushi/default.nix
  59. +10 −3 pkgs/desktops/gnome-3/core/totem/default.nix
  60. +2 −2 pkgs/desktops/gnome-3/core/tracker-miners/default.nix
  61. +4 −13 pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch
  62. +8 −15 pkgs/desktops/gnome-3/core/tracker/default.nix
  63. +12 −0 pkgs/desktops/gnome-3/core/tracker/fix-paths.patch
  64. +2 −2 pkgs/desktops/gnome-3/core/yelp-tools/default.nix
  65. +2 −2 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix
  66. +2 −2 pkgs/desktops/gnome-3/core/yelp/default.nix
  67. +2 −2 pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
  68. +5 −1 pkgs/desktops/gnome-3/misc/gpaste/default.nix
  69. +2 −2 pkgs/development/libraries/atk/default.nix
  70. +6 −12 pkgs/development/libraries/gdk-pixbuf/default.nix
  71. +5 −3 pkgs/development/libraries/gdk-pixbuf/installed-tests-path.patch
  72. +0 −18 pkgs/development/libraries/gdk-pixbuf/no-mime-sniffing.patch
  73. +3 −3 pkgs/development/libraries/gexiv2/default.nix
  74. +7 −2 pkgs/development/libraries/glib-networking/default.nix
  75. +6 −26 pkgs/development/libraries/glib/default.nix
  76. +2 −2 pkgs/development/libraries/gobject-introspection/default.nix
  77. +1 −1 pkgs/development/libraries/gtksourceview/3.x.nix
  78. +1 −1 pkgs/development/libraries/gtksourceview/4.x.nix
  79. +3 −4 pkgs/development/libraries/gvfs/default.nix
  80. +4 −3 pkgs/development/libraries/libchamplain/default.nix
  81. +2 −2 pkgs/development/libraries/libdazzle/default.nix
  82. +4 −4 pkgs/development/libraries/libdbusmenu/default.nix
  83. +2 −10 pkgs/development/libraries/libgtop/default.nix
  84. +2 −2 pkgs/development/libraries/libgweather/default.nix
  85. +2 −2 pkgs/development/libraries/librsvg/default.nix
  86. +2 −2 pkgs/development/libraries/libsoup/default.nix
  87. +2 −2 pkgs/development/libraries/vte/default.nix
  88. +4 −2 pkgs/development/libraries/webkitgtk/default.nix
  89. +2 −2 pkgs/tools/package-management/packagekit/default.nix
13 changes: 2 additions & 11 deletions pkgs/applications/audio/rhythmbox/default.nix
Original file line number Diff line number Diff line change
@@ -16,24 +16,15 @@
}:
let
pname = "rhythmbox";
version = "3.4.2";
version = "3.4.3";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

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

patches = [
# build with GStreamer 1.14 https://bugzilla.gnome.org/show_bug.cgi?id=788706
(fetchurl {
name = "fmradio-Fix-build-with-GStreamer-master.patch";
url = https://bugzilla.gnome.org/attachment.cgi?id=361178;
sha256 = "1h09mimlglj9hcmc3pfp0d6c277mqh2khwv9fryk43pkv3904d2w";
})
];

nativeBuildInputs = [
pkgconfig
intltool perl perlPackages.XMLParser
4 changes: 2 additions & 2 deletions pkgs/applications/misc/orca/default.nix
Original file line number Diff line number Diff line change
@@ -9,13 +9,13 @@

buildPythonApplication rec {
pname = "orca";
version = "3.30.2";
version = "3.31.91";

format = "other";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "17asibc46i5gr2fw04jvvdi85zzmxwlnhyq7r6cr3m5prrdr8a53";
sha256 = "03j1cmkljw7zdlzyk3yygmqaj9nra8sh5zcl7nz82h0civkl5nxr";
};

patches = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/accerciser/default.nix
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@

stdenv.mkDerivation rec {
name = "accerciser-${version}";
version = "3.22.0";
version = "3.31.4";

src = fetchurl {
url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "883306274442c7ecc076b24afca5190c835c40871ded1b9790da69347e9ca3c5";
sha256 = "17x0c08k483vnpixkg547xildlpv649bv4z2qc3m97xhikbbb2a8";
};

nativeBuildInputs = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/cheese/default.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

stdenv.mkDerivation rec {
name = "cheese-${version}";
version = "3.30.0";
version = "3.31.90";

src = fetchurl {
url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0zz2bgjaf2lsmfs3zn24925vbjb0rycr39i288brlbzixrpcyljr";
sha256 = "1364svgqmr2ljjpykhqygcba29vv5mgi0vdhq559z9zr826mgwfa";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/evolution/default.nix
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@
, libcanberra-gtk3, bogofilter, gst_all_1, procps, p11-kit, openldap }:

let
version = "3.30.5";
version = "3.31.92";
in stdenv.mkDerivation rec {
name = "evolution-${version}";

src = fetchurl {
url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1hhxj3rh921pp3l3c5k33bdypcas1p66krzs65k1qn82c5fpgl2h";
sha256 = "0w6lvhqaq2q3ghdnjgkmb1q8lmlnsavg6v3zi94xsrk4i2lk5czk";
};

propagatedUserEnvPkgs = [ evolution-data-server ];
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/file-roller/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
name = "file-roller-${version}";
version = "3.30.1";
version = "3.31.91";

src = fetchurl {
url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0kiragsqyixyx15747b71qc4nw8y4jx9d55wgg612xb0hp5l9pj1";
sha256 = "1b8yjmra1gjf1fvsvykqsamji8dph09p19g87ifxdnmf9gk91pg6";
};

LANG = "en_US.UTF-8"; # postinstall.py
15 changes: 15 additions & 0 deletions pkgs/desktops/gnome-3/apps/gedit/block-update-desktop.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--- a/build-aux/meson/post_install.py
+++ b/build-aux/meson/post_install.py
@@ -17,9 +17,9 @@ if 'DESTDIR' not in os.environ:
subprocess.call(['gtk-update-icon-cache', '-qtf',
os.path.join(datadir, 'icons', 'hicolor')])

- print('Updating desktop database...')
- subprocess.call(['update-desktop-database', '-q',
- os.path.join(datadir, 'applications')])
+ # print('Updating desktop database...')
+ # subprocess.call(['update-desktop-database', '-q',
+ # os.path.join(datadir, 'applications')])

print('Compiling python modules...')
subprocess.call([sys.executable, '-m', 'compileall', '-f', '-q',
38 changes: 29 additions & 9 deletions pkgs/desktops/gnome-3/apps/gedit/default.nix
Original file line number Diff line number Diff line change
@@ -1,28 +1,48 @@
{ stdenv, intltool, fetchurl
{ stdenv, meson, fetchurl, python3
, pkgconfig, gtk3, glib, adwaita-icon-theme
, libpeas, gtksourceview, gsettings-desktop-schemas
, wrapGAppsHook, itstool, libsoup, libxml2
, gnome3, gspell }:
, libpeas, gtksourceview4, gsettings-desktop-schemas
, wrapGAppsHook, ninja, libsoup, libxml2
, gnome3, gspell, perl, itstool }:

stdenv.mkDerivation rec {
name = "gedit-${version}";
version = "3.30.2";
version = "3.31.92";

src = fetchurl {
url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0qwig35hzvjaqic9x92jcpmycnvcybsbnbiw6rppryx0arwb3wza";
sha256 = "1sbwxcrqpghfkkkim9idpj13xha5f5j7xysxc07vsd3356vy7gkc";
};

nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ];
nativeBuildInputs = [
pkgconfig wrapGAppsHook meson ninja libxml2
python3 perl itstool
];

buildInputs = [
gtk3 glib
adwaita-icon-theme libsoup
libpeas gtksourceview
libpeas gtksourceview4
gsettings-desktop-schemas gspell
];

enableParallelBuilding = true;
patches = [
# Do not update desktop database
./block-update-desktop.patch
];

postPatch = ''
chmod +x build-aux/meson/post_install.py
chmod +x plugins/externaltools/scripts/gedit-tool-merge.pl
patchShebangs build-aux/meson/post_install.py
patchShebangs plugins/externaltools/scripts/gedit-tool-merge.pl
'';

mesonFlags = [
"--buildtype=plain" # don't require git
];

# Reliably fails to generate gedit-file-browser-enum-types.h in time
enableParallelBuilding = false;

passthru = {
updateScript = gnome3.updateScript {
8 changes: 4 additions & 4 deletions pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix
Original file line number Diff line number Diff line change
@@ -3,19 +3,19 @@
, spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala
, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils
, mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret
, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk
, libcap_ng, numactl, xen, libapparmor, json-glib, webkitgtk, vte
}:

# TODO: ovirt (optional)

let
version = "3.30.3";
version = "3.31.90";
in stdenv.mkDerivation rec {
name = "gnome-boxes-${version}";

src = fetchurl {
url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0a9ljwhkanszzyzl0bhad8vmzk7v4wafl9b1zn09pf57znyymf3s";
sha256 = "110vmhcafd7aw55k0injmvicszfhjvkqvh9mwwm1v0vz0saw4iw5";
};

doCheck = true;
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd
tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive
gnome3.adwaita-icon-theme librsvg acl libgudev libsecret
libcap_ng numactl xen libapparmor
libcap_ng numactl xen libapparmor vte
];

preFixup = ''
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@

let
pname = "gnome-calendar";
version = "3.30.1";
version = "3.31.90";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1avi7a29y8d8kzwslp51nwy6s692alms7917454j0xpfc6hnw62s";
sha256 = "1264bkggj1qcqgnbiyw6zdck89m071nji7sjx36myz0m2gv6cqc8";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

stdenv.mkDerivation rec {
name = "gnome-clocks-${version}";
version = "3.30.1";
version = "3.31.2";

src = fetchurl {
url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "009fr6zwv37wryi0c0syi4i7pxpdbn3gliws68l99cjsbn2qd6pc";
sha256 = "0f0ak4b4vxh3b2c4wkg76c210ivffw2j8pcg78zkhm9i7l5aiv09";
};

passthru = {
17 changes: 6 additions & 11 deletions pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
Original file line number Diff line number Diff line change
@@ -8,16 +8,19 @@

stdenv.mkDerivation rec {
name = "gnome-documents-${version}";
version = "3.30.0";
version = "3.31.92";

src = fetchurl {
url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0zchkjpc9algmxrpj0f9i2lc4h1yp8z0h76vn32xa9jr46x4lsh6";
sha256 = "0pqm086dvjkcqa5fyysmbv883jypramhb6fxd5h18rqr7r7clfay";
};

doCheck = true;

mesonFlags = [ "-Dgetting-started=true" ];
mesonFlags = [
"-Dgetting-started=true"
"--buildtype=plain"
];

nativeBuildInputs = [
meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook python3
@@ -31,14 +34,6 @@ stdenv.mkDerivation rec {
gnome-desktop libzapojit libgepub
];

patches = [
# fix RPATH to libgd
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/gnome-documents/commit/d18a92e0a940073ac766f609937539e4fc6cdbb7.patch";
sha256 = "0s3mk8vrl1gzk93yvgqbnz44i27qw1d9yvvmnck3fv23phrxkzk9";
})
];

postPatch = ''
chmod +x meson_post_install.py # patchShebangs requires executable file
patchShebangs meson_post_install.py
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

stdenv.mkDerivation rec {
name = "gnome-getting-started-docs-${version}";
version = "3.30.0";
version = "3.31.91";

src = fetchurl {
url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "10vihv6n8703rapf915waz1vzr7axk43bjlhmm3hb7kwm32rc61k";
sha256 = "0vc4ywgnm003aqkm5xrrh6bpz1y8xhk3cva1rnarzhcchq9xagg6";
};

passthru = {
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
Original file line number Diff line number Diff line change
@@ -3,11 +3,11 @@

stdenv.mkDerivation rec {
name = "gnome-logs-${version}";
version = "3.30.0";
version = "3.31.4";

src = fetchurl {
url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1rsk2whps7rwl01mmjmhwwww4iv09fsszils9zmgqd79y7l3fmyh";
sha256 = "1gji11isymc8dx8fca9kyq8vn425qxdm6qj1ylkadj3878swira1";
};

mesonFlags = [
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@

let
pname = "gnome-maps";
version = "3.30.3";
version = "3.31.92";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

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

doCheck = true;
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-music/default.nix
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

python3.pkgs.buildPythonApplication rec {
pname = "gnome-music";
version = "3.30.2";
version = "3.31.91";

format = "other";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1d9gd9rqy71hibfrz4zglimvgv6yn1pw22cnrn7pbdz6k4yq209d";
sha256 = "0zggi2cnvrfb7wg23bk9df7mng49xpir4cf8l8ga0d7qgips32q7";
};

nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
4 changes: 2 additions & 2 deletions pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
Original file line number Diff line number Diff line change
@@ -5,13 +5,13 @@
, gnome3, libxml2 }:

let
version = "3.30.3";
version = "3.31.91";
in stdenv.mkDerivation rec {
name = "gnome-notes-${version}";

src = fetchurl {
url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
sha256 = "1mkpi2i9nqpip5l15ihjcscyiri113s0705sjgh6b89164ahyn5k";
sha256 = "11cmrkv8vqg3ra9ps1cnszlicyldfghfgahndy2lqid8cmimpw0x";
};

doCheck = true;
20 changes: 16 additions & 4 deletions pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
Original file line number Diff line number Diff line change
@@ -4,22 +4,25 @@
, grilo, gnome-online-accounts
, desktop-file-utils, wrapGAppsHook
, gnome3, gdk_pixbuf, gexiv2, geocode-glib
, dleyna-renderer }:
, dleyna-renderer, dbus, meson, ninja, python3 }:

let
pname = "gnome-photos";
version = "3.30.1";
version = "3.31.91";
in stdenv.mkDerivation rec {
name = "${pname}-${version}";

src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "1mf1887x0pk46h6l51rfkpn29fwp3yvmqkk99kr1iwpz0lakyx6f";
sha256 = "1ncqczsp3v1wnf2zfk38mr2rcqcklmsrphb3fl46pgnxprzb10g7";
};

# doCheck = true;

nativeBuildInputs = [ pkgconfig gettext itstool libxml2 desktop-file-utils wrapGAppsHook ];
nativeBuildInputs = [
pkgconfig gettext itstool meson ninja libxml2
desktop-file-utils wrapGAppsHook python3
];
buildInputs = [
gtk3 glib gegl babl libgdata libdazzle
gnome3.gsettings-desktop-schemas
@@ -28,8 +31,17 @@ in stdenv.mkDerivation rec {
gnome-online-accounts tracker
gexiv2 geocode-glib dleyna-renderer
tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
dbus
];

mesonFlags = [
"--buildtype=plain" # don't do any git commands
];

postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';

passthru = {
updateScript = gnome3.updateScript {
Loading