git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'gnome-40'
commit9468b073267c9159d79b89686fabd09367f74ac3 authorJan Tojnar <jtojnar@gmail.com> dateFri 7 May 2021, 12:12 (6 years ago) parent7916603e744a29
247 files changed+2914−1237
doc/languages-frameworks/gnome.section.md+1−1 maintainers/scripts/update.nix+13−1 maintainers/scripts/update.py+3 nixos/doc/manual/release-notes/rl-2105.xml+1−1 nixos/modules/services/x11/desktop-managers/gnome3.nix+2−1 nixos/modules/services/x11/display-managers/gdm.nix+4−4 nixos/tests/installed-tests/default.nix+1 nixos/tests/installed-tests/librsvg.nix+9 pkgs/applications/audio/sound-juicer/default.nix+47−17 pkgs/applications/backup/deja-dup/default.nix+4−4 pkgs/applications/editors/gnome-builder/default.nix+6−4 pkgs/applications/editors/gnome-latex/default.nix+45−8 pkgs/applications/graphics/ImageMagick/7.0.nix+5−1 pkgs/applications/graphics/gimp/default.nix+4−9 pkgs/applications/graphics/gnome-photos/default.nix+5−19 pkgs/applications/graphics/gthumb/default.nix+3−2 pkgs/applications/graphics/inkscape/default.nix+8 pkgs/applications/misc/font-manager/default.nix+53−6 pkgs/applications/misc/gnome-multi-writer/default.nix+2−2 pkgs/applications/misc/orca/default.nix+3−3 pkgs/applications/misc/orca/fix-paths.patch+16−10 pkgs/applications/networking/calls/default.nix+2 pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix+15−1 pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix+6−12 pkgs/applications/networking/mailreaders/evolution/evolution/default.nix+3−6 pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patch−21 pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix+1−7 pkgs/applications/office/elementary-planner/default.nix+2 pkgs/applications/office/gnucash/default.nix+11−3 pkgs/applications/office/gnumeric/default.nix+1 pkgs/applications/version-management/meld/default.nix+1 pkgs/applications/video/pitivi/default.nix+3−3 pkgs/data/documentation/gnome-user-docs/default.nix+3−3 pkgs/data/fonts/cantarell-fonts/default.nix+5−7 pkgs/data/misc/mobile-broadband-provider-info/default.nix+8−3 pkgs/desktops/gnome-3/apps/accerciser/default.nix+1 pkgs/desktops/gnome-3/apps/cheese/default.nix+27−23 pkgs/desktops/gnome-3/apps/file-roller/default.nix+11−4 pkgs/desktops/gnome-3/apps/gedit/default.nix+3−3 pkgs/desktops/gnome-3/apps/gnome-books/default.nix+5−6 pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix+6−6 pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix+5−14 pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch+17 pkgs/desktops/gnome-3/apps/gnome-characters/default.nix+9−6 pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+3−3 pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix−25 pkgs/desktops/gnome-3/apps/gnome-maps/default.nix+8−3 pkgs/desktops/gnome-3/apps/gnome-music/default.nix+3−3 pkgs/desktops/gnome-3/apps/gnome-notes/default.nix+9−8 pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix+3−3 pkgs/desktops/gnome-3/apps/gnome-weather/default.nix+38−8 pkgs/desktops/gnome-3/apps/seahorse/default.nix+3−3 pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+3−3 pkgs/desktops/gnome-3/core/baobab/default.nix+42−12 pkgs/desktops/gnome-3/core/dconf-editor/default.nix+41−8 pkgs/desktops/gnome-3/core/eog/default.nix+3−3 pkgs/desktops/gnome-3/core/epiphany/default.nix+11−9 pkgs/desktops/gnome-3/core/evince/default.nix+5−3 pkgs/desktops/gnome-3/core/evolution-data-server/default.nix+3−2 pkgs/desktops/gnome-3/core/gdm/default.nix+9−6 pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix+3−3 pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix+48−14 pkgs/desktops/gnome-3/core/gnome-calculator/default.nix+54−11 pkgs/desktops/gnome-3/core/gnome-contacts/default.nix+5−3 pkgs/desktops/gnome-3/core/gnome-control-center/default.nix+24−21 pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch+48−46 pkgs/desktops/gnome-3/core/gnome-desktop/default.nix+61−18 pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix+4−12 pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix+54−14 pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix+5−5 pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch+1−20 pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix+10−14 pkgs/desktops/gnome-3/core/gnome-keyring/default.nix+46−25 pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix+3−3 pkgs/desktops/gnome-3/core/gnome-session/ctl.nix+5−4 pkgs/desktops/gnome-3/core/gnome-session/default.nix+4−11 pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix+3−3 pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix+12−4 pkgs/desktops/gnome-3/core/gnome-shell/default.nix+22−10 pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch+1−1 pkgs/desktops/gnome-3/core/gnome-software/default.nix+7−6 pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix+48−11 pkgs/desktops/gnome-3/core/gnome-terminal/default.nix+2−2 pkgs/desktops/gnome-3/core/gnome-tour/default.nix+3−3 pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nix−17 pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix−7 pkgs/desktops/gnome-3/core/mutter/default.nix+12−5 pkgs/desktops/gnome-3/core/nautilus/default.nix+7−3 pkgs/desktops/gnome-3/core/rygel/default.nix+1 pkgs/desktops/gnome-3/core/simple-scan/default.nix+5−3 pkgs/desktops/gnome-3/core/sushi/default.nix+1−4 pkgs/desktops/gnome-3/core/yelp-xsl/default.nix+3−3 pkgs/desktops/gnome-3/core/yelp/default.nix+3−3 pkgs/desktops/gnome-3/default.nix+2−2 pkgs/desktops/gnome-3/devtools/devhelp/default.nix+3−3 pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix+3−3 pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+2−2 pkgs/desktops/gnome-3/extensions/hot-edge/default.nix+33 pkgs/desktops/gnome-3/find-latest-version.py+27−12 pkgs/desktops/gnome-3/games/gnome-chess/default.nix+41−8 pkgs/desktops/gnome-3/games/gnome-klotski/default.nix+2−2 pkgs/desktops/gnome-3/games/gnome-mines/default.nix+3−3 pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix+54−9 pkgs/desktops/gnome-3/games/gnome-robots/default.nix+49−14 pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix+3−3 pkgs/desktops/gnome-3/games/gnome-taquin/default.nix+50−10 pkgs/desktops/gnome-3/games/iagno/default.nix+14 pkgs/desktops/gnome-3/games/lightsoff/default.nix+3−3 pkgs/desktops/gnome-3/games/swell-foop/default.nix+51−16 pkgs/desktops/gnome-3/games/tali/default.nix+3−3 pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patch−10 pkgs/desktops/gnome-3/misc/geary/default.nix+18−15 pkgs/desktops/gnome-3/misc/gitg/default.nix+21−23 pkgs/desktops/gnome-3/misc/gnome-applets/default.nix+5−3 pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix+2−2 pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix+3−2 pkgs/desktops/gnome-3/misc/gnome-panel/default.nix+3−2 pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix+7−7 pkgs/desktops/gnome-3/misc/gpaste/default.nix+2−2 pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch+1−1 pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix+3−2 pkgs/desktops/gnome-3/misc/metacity/default.nix+3−2 pkgs/desktops/gnome-3/misc/nautilus-python/default.nix+1 pkgs/desktops/gnome-3/update.nix+2−2 pkgs/desktops/pantheon/apps/appcenter/default.nix+10−1 pkgs/desktops/pantheon/apps/elementary-calendar/default.nix+2 pkgs/desktops/pantheon/apps/elementary-code/default.nix+9 pkgs/desktops/pantheon/apps/elementary-music/default.nix+9 pkgs/desktops/pantheon/apps/elementary-photos/default.nix+9 pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix+8 pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix+9 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix+2 pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix+15 pkgs/development/compilers/vala/default.nix+10−3 pkgs/development/libraries/amtk/default.nix+11−4 pkgs/development/libraries/appstream/default.nix+54−16 pkgs/development/libraries/at-spi2-atk/default.nix+1 pkgs/development/libraries/at-spi2-core/default.nix+6−3 pkgs/development/libraries/atk/default.nix+1 pkgs/development/libraries/atkmm/default.nix+1 pkgs/development/libraries/cairomm/1.16.nix+70 pkgs/development/libraries/clutter-gst/default.nix+1 pkgs/development/libraries/clutter-gtk/default.nix+1 pkgs/development/libraries/clutter/default.nix+1 pkgs/development/libraries/cogl/default.nix+1 pkgs/development/libraries/dconf/default.nix+3−2 pkgs/development/libraries/folks/default.nix+15−18 pkgs/development/libraries/gcr/default.nix+3−2 pkgs/development/libraries/gdk-pixbuf/default.nix+25−21 pkgs/development/libraries/gegl/4.0.nix+6−5 pkgs/development/libraries/gexiv2/default.nix+1 pkgs/development/libraries/gfbgraph/default.nix+1 pkgs/development/libraries/gjs/default.nix+16−14 pkgs/development/libraries/glib-networking/default.nix+3−2 pkgs/development/libraries/glib/default.nix+2−2 pkgs/development/libraries/glibmm/2.68.nix+59 pkgs/development/libraries/glibmm/default.nix+1 pkgs/development/libraries/gnome-online-accounts/default.nix+2−3 pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch+4−2 pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch+7−8 pkgs/development/libraries/gobject-introspection/default.nix+3−2 pkgs/development/libraries/goffice/default.nix+1 pkgs/development/libraries/gom/default.nix+1 pkgs/development/libraries/goocanvasmm/default.nix+1 pkgs/development/libraries/grilo-plugins/default.nix+2−2 pkgs/development/libraries/gsettings-desktop-schemas/default.nix+3−3 pkgs/development/libraries/gsound/default.nix+1 pkgs/development/libraries/gstreamer/bad/default.nix+10 pkgs/development/libraries/gstreamer/gstreamermm/default.nix+2−2 pkgs/development/libraries/gtk/4.x.nix+30−29 pkgs/development/libraries/gtkmm/3.x.nix+3−2 pkgs/development/libraries/gtkmm/4.x.nix+91 pkgs/development/libraries/gtksourceview/4.x.nix+67−21 pkgs/development/libraries/gtksourceview/5.x.nix+99 pkgs/development/libraries/gupnp-av/default.nix+1 pkgs/development/libraries/gupnp-dlna/default.nix+1 pkgs/development/libraries/gupnp-igd/default.nix+1 pkgs/development/libraries/gvfs/default.nix+3−2 pkgs/development/libraries/json-glib/default.nix+1 pkgs/development/libraries/jsonrpc-glib/default.nix+1 pkgs/development/libraries/lasem/default.nix+1 pkgs/development/libraries/libblockdev/default.nix+8−1 pkgs/development/libraries/libchamplain/default.nix+1 pkgs/development/libraries/libcryptui/default.nix+1 pkgs/development/libraries/libdazzle/default.nix+2−2 pkgs/development/libraries/libepc/default.nix+1 pkgs/development/libraries/libgda/6.x.nix+1 pkgs/development/libraries/libgda/default.nix+1 pkgs/development/libraries/libgdamm/default.nix+1 pkgs/development/libraries/libgee/default.nix+3−2 pkgs/development/libraries/libgnomekbd/default.nix+7−4 pkgs/development/libraries/libgsf/default.nix+1 pkgs/development/libraries/libgtop/default.nix+1 pkgs/development/libraries/libgudev/default.nix+21−6 pkgs/development/libraries/libgweather/default.nix+51−11 pkgs/development/libraries/libhandy/default.nix+37−7 pkgs/development/libraries/libhttpseverywhere/default.nix+1 pkgs/development/libraries/libmanette/default.nix+1 pkgs/development/libraries/libpeas/default.nix+3−2 pkgs/development/libraries/libpst/default.nix+4−3 pkgs/development/libraries/librest/default.nix+25−6 pkgs/development/libraries/librsvg/default.nix+62−27 pkgs/development/libraries/libsigcxx/3.0.nix+42 pkgs/development/libraries/libsigcxx/default.nix+5−4 pkgs/development/libraries/libsoup/default.nix+1 pkgs/development/libraries/libunity/default.nix+13−9 pkgs/development/libraries/libunity/fix-vala.patch+10−34 pkgs/development/libraries/libvirt-glib/default.nix+35−9 pkgs/development/libraries/libwnck/3.x.nix+1 pkgs/development/libraries/libxmlxx/default.nix+1 pkgs/development/libraries/libzapojit/default.nix+1 pkgs/development/libraries/pango/default.nix+3−11 pkgs/development/libraries/pangomm/2.48.nix+65 pkgs/development/libraries/pangomm/default.nix+1 pkgs/development/libraries/poppler/default.nix+15−2 pkgs/development/libraries/rarian/default.nix−6 pkgs/development/libraries/speechd/default.nix+8 pkgs/development/libraries/template-glib/default.nix+1 pkgs/development/libraries/tepl/default.nix+6−3 pkgs/development/libraries/totem-pl-parser/default.nix+1 pkgs/development/libraries/tracker-miners/default.nix+2−2 pkgs/development/libraries/tracker/default.nix+20−12 pkgs/development/libraries/tracker/fix-docs.patch+28 pkgs/development/libraries/umockdev/default.nix+27−16 pkgs/development/libraries/vte/default.nix+24−17 pkgs/development/libraries/webkitgtk/default.nix+20−13 pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix+2−2 pkgs/development/libraries/zeitgeist/default.nix+5−5 pkgs/development/misc/yelp-tools/default.nix+23−7 pkgs/development/python-modules/pyatspi/default.nix+3−2 pkgs/development/python-modules/pygobject/3.36.nix−7 pkgs/development/python-modules/pygobject/3.nix+40−11 pkgs/development/python-modules/tappy/default.nix+29 pkgs/development/tools/profiling/sysprof/capture.nix+1 pkgs/development/tools/profiling/sysprof/default.nix+15−4 pkgs/development/tools/vala-lint/default.nix+6−6 pkgs/tools/admin/gtk-vnc/default.nix+4−12 pkgs/tools/networking/gupnp-tools/default.nix+1 pkgs/tools/networking/networkmanager/applet/default.nix+1 pkgs/tools/networking/networkmanager/fortisslvpn/default.nix+1 pkgs/tools/networking/networkmanager/libnma/default.nix+1 pkgs/tools/networking/networkmanager/openconnect/default.nix+1 pkgs/tools/networking/networkmanager/openvpn/default.nix+1 pkgs/tools/networking/networkmanager/vpnc/default.nix+1 pkgs/tools/text/gtranslator/default.nix+5−3 pkgs/top-level/all-packages.nix+24−2 pkgs/top-level/python-packages.nix+2
doc/languages-frameworks/gnome.section.md+1−1
@@ -68,7 +68,7 @@ preFixup = ''
6868
6969Fortunately, there is [`wrapGAppsHook`]{#ssec-gnome-hooks-wrapgappshook}. It works in conjunction with other setup hooks that populate environment variables, and it will then wrap all executables in `bin` and `libexec` directories using said variables.
7070
71−For convenience, it also adds `dconf.lib` for a GIO module implementing a GSettings backend using `dconf`, `gtk3` for GSettings schemas, and `librsvg` for GdkPixbuf loader to the closure. In case you are packaging a program without a graphical interface, you might want to use [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook}, which runs the same script as `wrapGAppsHook` but does not bring `gtk3` and `librsvg` into the closure.
71+For convenience, it also adds `dconf.lib` for a GIO module implementing a GSettings backend using `dconf`, `gtk3` for GSettings schemas, and `librsvg` for GdkPixbuf loader to the closure. There is also [`wrapGAppsHook4`]{#ssec-gnome-hooks-wrapgappshook4}, which replaces GTK 3 with GTK 4. And in case you are packaging a program without a graphical interface, you might want to use [`wrapGAppsNoGuiHook`]{#ssec-gnome-hooks-wrapgappsnoguihook}, which runs the same script as `wrapGAppsHook` but does not bring `gtk3` and `librsvg` into the closure.
7272
7373- `wrapGAppsHook` itself will add the package’s `share` directory to `XDG_DATA_DIRS`.
7474
maintainers/scripts/update.nix+13−1
@@ -1,5 +1,6 @@
11{ package ? null
22, maintainer ? null
3+, predicate ? null
34, path ? null
45, max-workers ? null
56, include-overlays ? false
@@ -69,6 +70,11 @@ let
6970 */
7071 packagesWith = packagesWithPath [];
7172
73+ /* Recursively find all packages in `pkgs` with updateScript matching given predicate.
74+ */
75+ packagesWithUpdateScriptMatchingPredicate = cond:
76+ packagesWith (path: pkg: builtins.hasAttr "updateScript" pkg && cond path pkg);
77+
7278 /* Recursively find all packages in `pkgs` with updateScript by given maintainer.
7379 */
7480 packagesWithUpdateScriptAndMaintainer = maintainer':
@@ -79,7 +85,7 @@ let
7985 else
8086 builtins.getAttr maintainer' lib.maintainers;
8187 in
82− packagesWith (path: pkg: builtins.hasAttr "updateScript" pkg &&
88+ packagesWithUpdateScriptMatchingPredicate (path: pkg:
8389 (if builtins.hasAttr "maintainers" pkg.meta
8490 then (if builtins.isList pkg.meta.maintainers
8591 then builtins.elem maintainer pkg.meta.maintainers
@@ -120,6 +126,8 @@ let
120126 packages =
121127 if package != null then
122128 [ (packageByName package pkgs) ]
129+ else if predicate != null then
130+ packagesWithUpdateScriptMatchingPredicate predicate pkgs
123131 else if maintainer != null then
124132 packagesWithUpdateScriptAndMaintainer maintainer pkgs
125133 else if path != null then
@@ -139,6 +147,10 @@ let
139147
140148 to run update script for specific package, or
141149
150+ % nix-shell maintainers/scripts/update.nix --arg predicate '(path: pkg: builtins.isList pkg.updateScript && builtins.length pkg.updateScript >= 1 && (let script = builtins.head pkg.updateScript; in builtins.isAttrs script && script.name == "gnome-update-script"))'
151+
152+ to run update script for all packages matching given predicate, or
153+
142154 % nix-shell maintainers/scripts/update.nix --argstr path gnome3
143155
144156 to run update script for all package under an attribute path.
maintainers/scripts/update.py+3
@@ -39,6 +39,9 @@ async def run_update_script(nixpkgs_root: str, merge_lock: asyncio.Lock, temp_di
3939 if temp_dir is not None:
4040 worktree, _branch = temp_dir
4141
42+ # Ensure the worktree is clean before update.
43+ await check_subprocess('git', 'reset', '--hard', '--quiet', 'HEAD', cwd=worktree)
44+
4245 # Update scripts can use $(dirname $0) to get their location but we want to run
4346 # their clones in the git worktree, not in the main nixpkgs repo.
4447 update_script_command = map(lambda arg: re.sub(r'^{0}'.format(re.escape(nixpkgs_root)), worktree, arg), update_script_command)
nixos/doc/manual/release-notes/rl-2105.xml+1−1
@@ -27,7 +27,7 @@
2727 <para>The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series.</para>
2828 </listitem>
2929 <listitem>
30− <para>GNOME desktop environment was upgraded to 3.38, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.38/">release notes</link>.</para>
30+ <para>GNOME desktop environment was upgraded to 40, see the release notes for <link xlink:href="https://help.gnome.org/misc/release-notes/40.0/">40.0</link> and <link xlink:href="https://help.gnome.org/misc/release-notes/3.38/">3.38</link>.</para>
3131 </listitem>
3232 <listitem>
3333 <para>
nixos/modules/services/x11/desktop-managers/gnome3.nix+2−1
@@ -273,6 +273,7 @@ in
273273 services.accounts-daemon.enable = true;
274274 services.dleyna-renderer.enable = mkDefault true;
275275 services.dleyna-server.enable = mkDefault true;
276+ services.power-profiles-daemon.enable = mkDefault true;
276277 services.gnome3.at-spi2-core.enable = true;
277278 services.gnome3.evolution-data-server.enable = true;
278279 services.gnome3.gnome-keyring.enable = true;
@@ -365,10 +366,10 @@ in
365366 gnome-bluetooth
366367 gnome-color-manager
367368 gnome-control-center
368− gnome-getting-started-docs
369369 gnome-shell
370370 gnome-shell-extensions
371371 gnome-themes-extra
372+ pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
372373 pkgs.nixos-artwork.wallpapers.simple-dark-gray
373374 pkgs.nixos-artwork.wallpapers.simple-dark-gray-bottom
374375 pkgs.gnome-user-docs
nixos/modules/services/x11/display-managers/gdm.nix+4−4
@@ -218,14 +218,14 @@ in
218218 # We duplicate upstream's udev rules manually to make wayland with nvidia configurable
219219 services.udev.extraRules = ''
220220 # disable Wayland on Cirrus chipsets
221− ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-disable-wayland"
221+ ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false"
222222 # disable Wayland on Hi1710 chipsets
223− ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-disable-wayland"
223+ ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false"
224224 ${optionalString (!cfg.gdm.nvidiaWayland) ''
225− DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-disable-wayland"
225+ DRIVER=="nvidia", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false"
226226 ''}
227227 # disable Wayland when modesetting is disabled
228− IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-disable-wayland"
228+ IMPORT{cmdline}="nomodeset", RUN+="${gdm}/libexec/gdm-runtime-config set daemon WaylandEnable false"
229229 '';
230230
231231 systemd.user.services.dbus.wantedBy = [ "default.target" ];
nixos/tests/installed-tests/default.nix+1
@@ -97,6 +97,7 @@ in
9797 gsconnect = callInstalledTest ./gsconnect.nix {};
9898 ibus = callInstalledTest ./ibus.nix {};
9999 libgdata = callInstalledTest ./libgdata.nix {};
100+ librsvg = callInstalledTest ./librsvg.nix {};
100101 glib-testing = callInstalledTest ./glib-testing.nix {};
101102 libjcat = callInstalledTest ./libjcat.nix {};
102103 libxmlb = callInstalledTest ./libxmlb.nix {};
nixos/tests/installed-tests/librsvg.nixnew file+9
@@ -0,0 +1,9 @@
1+{ pkgs, makeInstalledTest, ... }:
2+
3+makeInstalledTest {
4+ tested = pkgs.librsvg;
5+
6+ testConfig = {
7+ virtualisation.memorySize = 2047;
8+ };
9+}
pkgs/applications/audio/sound-juicer/default.nix+47−17
@@ -1,29 +1,59 @@
1−{ lib, stdenv, fetchurl, pkg-config, glib, gtk3, intltool, itstool, libxml2, brasero
2−, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
3−, gsettings-desktop-schemas, wrapGAppsHook }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, meson
5+, ninja
6+, pkg-config
7+, glib
8+, gtk3
9+, itstool
10+, libxml2
11+, brasero
12+, libcanberra-gtk3
13+, gnome3
14+, gst_all_1
15+, libmusicbrainz5
16+, libdiscid
17+, isocodes
18+, gsettings-desktop-schemas
19+, wrapGAppsHook
20+}:
421
5−let
22+stdenv.mkDerivation rec {
623 pname = "sound-juicer";
7− version = "3.24.0";
8−in stdenv.mkDerivation rec {
9− name = "${pname}-${version}";
24+ version = "3.38.0";
1025
1126 src = fetchurl {
12− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "19qg4xv0f9rkq34lragkmhii1llxsa87llbl28i759b0ks4f6sny";
27+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
28+ sha256 = "08d5d81rz9sj3m5paw8fwbgxmhlbr7bcjdzpmzj832qvg8smydxf";
1429 };
1530
16− nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ];
31+ nativeBuildInputs = [
32+ meson
33+ ninja
34+ pkg-config
35+ itstool
36+ libxml2
37+ wrapGAppsHook
38+ ];
39+
1740 buildInputs = [
18− glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme
19− gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes
20− gst_all_1.gstreamer gst_all_1.gst-plugins-base
21− gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
41+ glib
42+ gtk3
43+ brasero
44+ libcanberra-gtk3
45+ gnome3.adwaita-icon-theme
46+ gsettings-desktop-schemas
47+ libmusicbrainz5
48+ libdiscid
49+ isocodes
50+ gst_all_1.gstreamer
51+ gst_all_1.gst-plugins-base
52+ gst_all_1.gst-plugins-good
53+ gst_all_1.gst-plugins-bad
2254 gst_all_1.gst-libav
2355 ];
2456
25− NIX_CFLAGS_COMPILE="-Wno-error=format-nonliteral";
26−
2757 passthru = {
2858 updateScript = gnome3.updateScript {
2959 packageName = pname;
@@ -34,7 +64,7 @@ in stdenv.mkDerivation rec {
3464 description = "A Gnome CD Ripper";
3565 homepage = "https://wiki.gnome.org/Apps/SoundJuicer";
3666 maintainers = [ maintainers.bdimcheff ];
37− license = licenses.gpl2;
67+ license = licenses.gpl2Plus;
3868 platforms = platforms.linux;
3969 };
4070}
pkgs/applications/backup/deja-dup/default.nix+4−4
@@ -12,7 +12,7 @@
1212, coreutils
1313, libsoup
1414, libsecret
15−, libhandy_0
15+, libhandy
1616, wrapGAppsHook
1717, libgpgerror
1818, json-glib
@@ -21,14 +21,14 @@
2121
2222stdenv.mkDerivation rec {
2323 pname = "deja-dup";
24− version = "42.6";
24+ version = "42.7";
2525
2626 src = fetchFromGitLab {
2727 domain = "gitlab.gnome.org";
2828 owner = "World";
2929 repo = pname;
3030 rev = version;
31− sha256 = "0grwlfakrnr9ij7h8lsfazlws6qix8pl50dr94cpxnnbjga9xn9z";
31+ sha256 = "1q66wccnph78cp1r5mln2iq4bcqdrrchxq3c1pjrzkmzwc6l93gz";
3232 };
3333
3434 patches = [
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
5353 glib
5454 gtk3
5555 libsecret
56− libhandy_0
56+ libhandy
5757 libgpgerror
5858 json-glib
5959 ];
pkgs/applications/editors/gnome-builder/default.nix+6−4
@@ -39,11 +39,11 @@
3939
4040stdenv.mkDerivation rec {
4141 pname = "gnome-builder";
42− version = "3.38.2";
42+ version = "3.40.2";
4343
4444 src = fetchurl {
4545 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
46− sha256 = "jFNco64yoZC1TZbTIHGVf+wBYYQHo2JRiMZFHngzYTs=";
46+ sha256 = "16kikslvcfjqj4q3j857mq9i8cyd965b3lvfzcwijc91x3ylr15j";
4747 };
4848
4949 nativeBuildInputs = [
@@ -99,7 +99,6 @@ stdenv.mkDerivation rec {
9999 '';
100100
101101 mesonFlags = [
102− "-Dpython_libprefix=${python3.libPrefix}"
103102 "-Ddocs=true"
104103
105104 # Making the build system correctly detect clang header and library paths
@@ -135,7 +134,10 @@ stdenv.mkDerivation rec {
135134 done
136135 '';
137136
138− passthru.updateScript = gnome3.updateScript { packageName = pname; };
137+ passthru.updateScript = gnome3.updateScript {
138+ packageName = pname;
139+ versionPolicy = "odd-unstable";
140+ };
139141
140142 meta = with lib; {
141143 description = "An IDE for writing GNOME-based software";
pkgs/applications/editors/gnome-latex/default.nix+45−8
@@ -1,21 +1,49 @@
1−{ lib, stdenv, fetchurl, wrapGAppsHook, gsettings-desktop-schemas, gspell, gtksourceview4, libgee
2−, tepl, amtk, gnome3, glib, pkg-config, intltool, itstool, libxml2 }:
3−let
1+{ lib
2+, stdenv
3+, fetchurl
4+, fetchpatch
5+, autoreconfHook
6+, gtk-doc
7+, vala
8+, gobject-introspection
9+, wrapGAppsHook
10+, gsettings-desktop-schemas
11+, gspell
12+, gtksourceview4
13+, libgee
14+, tepl
15+, amtk
16+, gnome3
17+, glib
18+, pkg-config
19+, intltool
20+, itstool
21+, libxml2
22+}:
23+
24+stdenv.mkDerivation rec {
425 version = "3.38.0";
526 pname = "gnome-latex";
6−in stdenv.mkDerivation {
7− name = "${pname}-${version}";
827
928 src = fetchurl {
1029 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
1130 sha256 = "0xqd49pgi82dygqnxj08i1v22b0vwwhx3zvdinhrx4jny339yam8";
1231 };
1332
14− NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
15− configureFlags = ["--disable-dconf-migration"];
33+ patches = [
34+ # Fix build with latest tepl.
35+ (fetchpatch {
36+ url = "https://gitlab.gnome.org/Archive/gnome-latex/commit/e1b01186f8a4e5d3fee4c9ccfbedd6d098517df9.patch";
37+ sha256 = "H8cbp5hDZoXytEdKE2D/oYHNKIbEFwxQoEaC4JMfGHY=";
38+ })
39+ ];
1640
1741 nativeBuildInputs = [
1842 pkg-config
43+ autoreconfHook
44+ gtk-doc
45+ vala
46+ gobject-introspection
1947 wrapGAppsHook
2048 itstool
2149 intltool
@@ -33,9 +61,18 @@ in stdenv.mkDerivation {
3361 tepl
3462 ];
3563
64+ configureFlags = [
65+ "--disable-dconf-migration"
66+ ];
67+
3668 doCheck = true;
3769
38− passthru.updateScript = gnome3.updateScript { packageName = pname; };
70+ NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
71+
72+ passthru.updateScript = gnome3.updateScript {
73+ packageName = pname;
74+ versionPolicy = "odd-unstable";
75+ };
3976
4077 meta = with lib; {
4178 homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX";
pkgs/applications/graphics/ImageMagick/7.0.nix+5−1
@@ -2,6 +2,7 @@
22, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre
33, lcms2, openexr, libpng, librsvg, libtiff, libxml2, openjpeg, libwebp, libheif
44, ApplicationServices
5+, Foundation
56, testVersion, imagemagick
67}:
78
@@ -51,7 +52,10 @@ stdenv.mkDerivation rec {
5152 ]
5253 ++ lib.optionals (!stdenv.hostPlatform.isMinGW)
5354 [ openexr librsvg openjpeg ]
54− ++ lib.optional stdenv.isDarwin ApplicationServices;
55+ ++ lib.optionals stdenv.isDarwin [
56+ ApplicationServices
57+ Foundation
58+ ];
5559
5660 propagatedBuildInputs =
5761 [ bzip2 freetype libjpeg lcms2 ]
pkgs/applications/graphics/gimp/default.nix+4−9
@@ -1,7 +1,6 @@
11{ stdenv
22, lib
33, fetchurl
4−, fetchpatch
54, substituteAll
65, autoreconfHook
76, pkg-config
@@ -34,6 +33,7 @@
3433, libexif
3534, gettext
3635, makeWrapper
36+, gtk-doc
3737, xorg
3838, glib-networking
3939, libmypaint
@@ -53,13 +53,13 @@ let
5353 python = python2.withPackages (pp: [ pp.pygtk ]);
5454in stdenv.mkDerivation rec {
5555 pname = "gimp";
56− version = "2.10.22";
56+ version = "2.10.24";
5757
5858 outputs = [ "out" "dev" ];
5959
6060 src = fetchurl {
6161 url = "http://download.gimp.org/pub/gimp/v${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
62− sha256 = "1fqqyshakvdarf1jipk2n33ibqr23ni22z3d8srq13bpydblpf1d";
62+ sha256 = "17lq6ns5qhspd171zqh76yf98xnn5n0hcl7hbhbx63cc6ribf6xx";
6363 };
6464
6565 patches = [
@@ -73,12 +73,6 @@ in stdenv.mkDerivation rec {
7373 # Use absolute paths instead of relying on PATH
7474 # to make sure plug-ins are loaded by the correct interpreter.
7575 ./hardcode-plugin-interpreters.patch
76−
77− # Fix crash without dot.
78− (fetchpatch {
79− url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/f83fd22c4b8701ffc4ce14383e5e22756a4bce04.patch";
80− sha256 = "POuvBhOSStO7hBGp4HgNx5F9pElFRoqN3W+i3u4zOnk=";
81− })
8276 ];
8377
8478 nativeBuildInputs = [
@@ -87,6 +81,7 @@ in stdenv.mkDerivation rec {
8781 intltool
8882 gettext
8983 makeWrapper
84+ gtk-doc
9085 ];
9186
9287 buildInputs = [
pkgs/applications/graphics/gnome-photos/default.nix+5−19
@@ -1,6 +1,5 @@
11{ lib, stdenv
22, fetchurl
3−, fetchpatch
43, at-spi2-core
54, babl
65, dbus
@@ -22,6 +21,7 @@
2221, gtk3
2322, itstool
2423, libdazzle
24+, libhandy
2525, libgdata
2626, libxml2
2727, meson
@@ -36,32 +36,17 @@
3636
3737stdenv.mkDerivation rec {
3838 pname = "gnome-photos";
39− version = "3.38.0";
39+ version = "40.0";
4040
4141 outputs = [ "out" "installedTests" ];
4242
4343 src = fetchurl {
44− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
45− sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6";
44+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
45+ sha256 = "1bzi79plw6ji6qlckhxnwfnswy6jpnhzmmyanml2i2xg73hp6bg0";
4646 };
4747
4848 patches = [
4949 ./installed-tests-path.patch
50−
51− # Port to Tracker 3
52− # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/135
53− (fetchpatch {
54− url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/f39a85bb1a82093f4ba615494ff7e95609674fc2.patch";
55− sha256 = "M5r5WuB1JpUBVN3KxNvpMiPWj0pIpT+ImQMOiGtUgT4=";
56− })
57− (fetchpatch {
58− url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/3d847ff80d429cadf0bc59aa50caa37bf27c0201.patch";
59− sha256 = "zGjSL1qpWVJ/5Ifgh2CbhFSBR/WDAra8F+YUOemyxyU=";
60− })
61− (fetchpatch {
62− url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/2eb923726147b05c936dee64b205d833525db1df.patch";
63− sha256 = "vCA6NXHzmNf2GoLqzWwIyziC6puJgJ0QTLeKWsAEFAE=";
64− })
6550 ];
6651
6752 nativeBuildInputs = [
@@ -99,6 +84,7 @@ stdenv.mkDerivation rec {
9984 gsettings-desktop-schemas
10085 gtk3
10186 libdazzle
87+ libhandy
10288 libgdata
10389 tracker
10490 tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema
pkgs/applications/graphics/gthumb/default.nix+3−2
@@ -32,11 +32,11 @@
3232
3333stdenv.mkDerivation rec {
3434 pname = "gthumb";
35− version = "3.10.2";
35+ version = "3.11.3";
3636
3737 src = fetchurl {
3838 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
39− sha256 = "/erkKBg3j5s8qwBgTu61t8Cnpez+ad4IuZOGd0ZDXJM=";
39+ sha256 = "11bvcimamdcksgqj1ymh54yzhpwc5j8glda8brqqhwq3h2wj0j9d";
4040 };
4141
4242 nativeBuildInputs = [
@@ -97,6 +97,7 @@ stdenv.mkDerivation rec {
9797 passthru = {
9898 updateScript = gnome3.updateScript {
9999 packageName = pname;
100+ versionPolicy = "odd-unstable";
100101 };
101102 };
102103
pkgs/applications/graphics/inkscape/default.nix+8
@@ -5,6 +5,7 @@
55, cmake
66, double-conversion
77, fetchurl
8+, fetchpatch
89, gettext
910, gdl
1011, ghostscript
@@ -71,6 +72,13 @@ stdenv.mkDerivation rec {
7172 # e.g., those from the "Effects" menu.
7273 python3 = "${python3Env}/bin/python";
7374 })
75+
76+ # Fix build with glib 2.68
77+ # https://gitlab.com/inkscape/inkscape/-/merge_requests/2790
78+ (fetchpatch {
79+ url = "https://gitlab.com/inkscape/inkscape/-/commit/eb24388f1730918edd9565d9e5d09340ec0b3b08.patch";
80+ sha256 = "d2FHRWcOzi0Vsr6t0MuLu3rWpvhFKuuvoXd4/NKUSJI=";
81+ })
7482 ];
7583
7684 postPatch = ''
pkgs/applications/misc/font-manager/default.nix+53−6
@@ -1,20 +1,61 @@
1−{ lib, stdenv, fetchFromGitHub, meson, ninja, gettext, python3,
2− pkg-config, libxml2, json-glib , sqlite, itstool, yelp-tools,
3− vala, gtk3, gnome3, desktop-file-utils, wrapGAppsHook, gobject-introspection,
4− libsoup, webkitgtk
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+, meson
5+, fetchpatch
6+, ninja
7+, gettext
8+, python3
9+, pkg-config
10+, libxml2
11+, json-glib
12+, sqlite
13+, itstool
14+, yelp-tools
15+, vala
16+, gsettings-desktop-schemas
17+, gtk3
18+, gnome3
19+, desktop-file-utils
20+, wrapGAppsHook
21+, gobject-introspection
22+, libsoup
23+, glib-networking
24+, webkitgtk
525}:
626
727stdenv.mkDerivation rec {
828 pname = "font-manager";
9− version = "0.8.5-1";
29+ version = "0.8.6";
1030
1131 src = fetchFromGitHub {
1232 owner = "FontManager";
1333 repo = "master";
1434 rev = version;
15− sha256 = "1p0hfnf06892hn25a6zv8fnhbh4ln11nn2fv1vjqs63rr59fprbk";
35+ sha256 = "0a18rbdy9d0fj0vnsc2rm7xlh17vjqn4kdyrq0ldzlzkb6zbdk2k";
1636 };
1737
38+ patches = [
39+ # Fix some Desktop Settings with GNOME 40.
40+ # https://github.com/FontManager/font-manager/issues/215
41+ (fetchpatch {
42+ url = "https://github.com/FontManager/font-manager/commit/b28f325d7951a66ebf1a2a432ee09fd22048a033.patch";
43+ sha256 = "dKbrXGb9a4JuG/4x9vprMlh5J17HKJFifRWq9BWp1ow=";
44+ })
45+ (fetchpatch {
46+ url = "https://github.com/FontManager/font-manager/commit/2147204d4c4c6b58161230500186c3a5d4eeb1c1.patch";
47+ sha256 = "2/PFLwf7h76fIIN4+lyjg/L0KVU1hhRQCfwCAGDpb00=";
48+ })
49+ (fetchpatch {
50+ url = "https://github.com/FontManager/font-manager/commit/3abc541ef8606727c72af7631c021809600336ac.patch";
51+ sha256 = "rJPnW+7uuFLxTf5tk+Rzo+xkw2+uzU6BkzPXLeR/RGc=";
52+ })
53+ (fetchpatch {
54+ url = "https://github.com/FontManager/font-manager/commit/03a822f0d7b72442cd2ffcc8668da265d3535e0d.patch";
55+ sha256 = "3Z2UqK5VV2bIwpGd1tA7fivd7ooIuV6CxTJhzgOAkIM=";
56+ })
57+ ];
58+
1859 nativeBuildInputs = [
1960 pkg-config
2061 meson
@@ -34,12 +75,18 @@ stdenv.mkDerivation rec {
3475 libxml2
3576 json-glib
3677 sqlite
78+ gsettings-desktop-schemas # for font settings
3779 gtk3
3880 gnome3.adwaita-icon-theme
3981 libsoup
82+ glib-networking # for SSL so that Google Fonts can load
4083 webkitgtk
4184 ];
4285
86+ mesonFlags = [
87+ "-Dreproducible=true" # Do not hardcode build directory…
88+ ];
89+
4390 postPatch = ''
4491 chmod +x meson_post_install.py
4592 patchShebangs meson_post_install.py
pkgs/applications/misc/gnome-multi-writer/default.nix+2−2
@@ -19,11 +19,11 @@
1919
2020stdenv.mkDerivation rec {
2121 pname = "gnome-multi-writer";
22− version = "3.32.1";
22+ version = "3.35.90";
2323
2424 src = fetchurl {
2525 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
26− sha256 = "1apdd8yi12zagf82k376a9wmdm27wzwdxpm2wf2pnwkaf786rmdw";
26+ sha256 = "07vgzjjdrxcp7h73z13h9agafxb4vmqx5i81bcfyw0ilw9kkdzmp";
2727 };
2828
2929 nativeBuildInputs = [
pkgs/applications/misc/orca/default.nix+3−3
@@ -35,13 +35,13 @@
3535
3636buildPythonApplication rec {
3737 pname = "orca";
38− version = "3.38.2";
38+ version = "40.0";
3939
4040 format = "other";
4141
4242 src = fetchurl {
43− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
44− sha256 = "UAX/LhHdH3E/WswZA6JwEZvFjDD9uMn4K8rHFJfGwjw=";
43+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
44+ sha256 = "0hq0zdcn80ficpcffbk667907v6m7dih3dhyc7ss01mrj3iyw000";
4545 };
4646
4747 patches = [
pkgs/applications/misc/orca/fix-paths.patch+16−10
@@ -1,6 +1,8 @@
1+diff --git a/src/orca/debug.py b/src/orca/debug.py
2+index e79482ed4..cbf3a24ec 100644
13--- a/src/orca/debug.py
24+++ b/src/orca/debug.py
3−@@ -474,7 +474,7 @@
5+@@ -502,7 +502,7 @@ def traceit(frame, event, arg):
46 return traceit
57
68 def getOpenFDCount(pid):
@@ -9,7 +11,7 @@
911 procs = procs.decode('UTF-8').split('\n')
1012 files = list(filter(lambda s: s and s[0] == 'f' and s[1:].isdigit(), procs))
1113
12−@@ -482,7 +482,7 @@
14+@@ -510,7 +510,7 @@ def getOpenFDCount(pid):
1315
1416 def getCmdline(pid):
1517 try:
@@ -18,7 +20,7 @@
1820 cmdline = openFile.read()
1921 openFile.close()
2022 except:
21−@@ -492,7 +492,7 @@
23+@@ -520,7 +520,7 @@ def getCmdline(pid):
2224 return cmdline
2325
2426 def pidOf(procName):
@@ -27,9 +29,11 @@
2729 shell=True,
2830 stdout=subprocess.PIPE).stdout
2931 pids = openFile.read()
32+diff --git a/src/orca/orca.py b/src/orca/orca.py
33+index 2fe0a0bf2..087526556 100644
3034--- a/src/orca/orca.py
3135+++ b/src/orca/orca.py
32−@@ -239,7 +239,7 @@
36+@@ -285,7 +285,7 @@ def updateKeyMap(keyboardEvent):
3337
3438 def _setXmodmap(xkbmap):
3539 """Set the keyboard map using xkbcomp."""
@@ -38,7 +42,7 @@
3842 stdin=subprocess.PIPE, stdout=None, stderr=None)
3943 p.communicate(xkbmap)
4044
41−@@ -297,7 +297,7 @@
45+@@ -363,7 +363,7 @@ def _storeXmodmap(keyList):
4246 """
4347
4448 global _originalXmodmap
@@ -47,7 +51,7 @@
4751
4852 def _restoreXmodmap(keyList=[]):
4953 """Restore the original xmodmap values for the keys in keyList.
50−@@ -309,7 +309,7 @@
54+@@ -375,7 +375,7 @@ def _restoreXmodmap(keyList=[]):
5155
5256 global _capsLockCleared
5357 _capsLockCleared = False
@@ -56,9 +60,11 @@
5660 stdin=subprocess.PIPE, stdout=None, stderr=None)
5761 p.communicate(_originalXmodmap)
5862
63+diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
64+index 8c9d40153..eec0d5437 100644
5965--- a/src/orca/orca_bin.py.in
6066+++ b/src/orca/orca_bin.py.in
61−@@ -59,7 +59,7 @@
67+@@ -62,7 +62,7 @@ class ListApps(argparse.Action):
6268 name = "[DEAD]"
6369
6470 try:
@@ -67,12 +73,12 @@
6773 except:
6874 cmdline = '(exception encountered)'
6975 else:
70−@@ -192,7 +192,7 @@
76+@@ -197,7 +197,7 @@ def inGraphicalDesktop():
7177 def otherOrcas():
7278 """Returns the pid of any other instances of Orca owned by this user."""
7379
74−- openFile = subprocess.Popen('pgrep -u %s orca' % os.getuid(),
75−+ openFile = subprocess.Popen('@pgrep@ -u %s orca' % os.getuid(),
80+- openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(),
81++ openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(),
7682 shell=True,
7783 stdout=subprocess.PIPE).stdout
7884 pids = openFile.read()
pkgs/applications/networking/calls/default.nix+2
@@ -17,6 +17,7 @@
1717, desktop-file-utils
1818, appstream-glib
1919, libpeas
20+, libgdata
2021, dbus
2122, vala
2223, wrapGAppsHook
@@ -65,6 +66,7 @@ stdenv.mkDerivation rec {
6566 callaudiod
6667 gtk3
6768 libpeas
69+ libgdata # required by some dependency transitively
6870 ];
6971
7072 checkInputs = [
pkgs/applications/networking/instant-messengers/pidgin-plugins/sipe/default.nix+15−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, pidgin, intltool, libxml2, gmime, nss }:
1+{ lib, stdenv, fetchurl, fetchpatch, pidgin, intltool, libxml2, gmime, nss }:
22
33stdenv.mkDerivation rec {
44 pname = "pidgin-sipe";
@@ -9,6 +9,20 @@ stdenv.mkDerivation rec {
99 sha256 = "0262sz00iqxylx0xfyr48xikhiqzr8pg7b4b7vwj5iv4qxpxv939";
1010 };
1111
12+ patches = [
13+ # add sipe_utils_memdup() function
14+ (fetchpatch {
15+ url = "https://repo.or.cz/siplcs.git/patch/567d0ddc0692adfef5f15d0d383825a9b2ea4b49";
16+ sha256 = "24L8ZfoOGc3JoTCGxuTNjuHzt5QgFDu1+vSoJpGvde4=";
17+ })
18+ # replace g_memdup() with sipe_utils_memdup()
19+ # g_memdup is deprecatein newer Glib
20+ (fetchpatch {
21+ url = "https://repo.or.cz/siplcs.git/patch/583a734e63833f03d11798b7b0d59a17d08ae60f";
22+ sha256 = "Ai6Czpy/FYvBi4GZR7yzch6OcouJgfreI9HcojhGVV4=";
23+ })
24+ ];
25+
1226 nativeBuildInputs = [ intltool ];
1327 buildInputs = [ pidgin gmime libxml2 nss ];
1428 enableParallelBuilding = true;
pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix+6−12
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "evolution-ews";
6− version = "3.38.3";
6+ version = "3.40.1";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "1s2jpviliazmhnpkh8dc57ga3c3612f2rnc0nfya5ndbi6lpzxhi";
10+ sha256 = "1kgxdacqqcq8yfkij6vyqlk5r4yqvw7gh7mxqii670hrn1mb2s50";
1111 };
1212
1313 nativeBuildInputs = [ cmake gettext intltool pkg-config ];
@@ -19,23 +19,17 @@ stdenv.mkDerivation rec {
1919 libmspack
2020 ];
2121
22− # Building with libmspack as reccommended: https://wiki.gnome.org/Apps/Evolution/Building#Build_evolution-ews
2322 cmakeFlags = [
23+ # Building with libmspack as recommended: https://wiki.gnome.org/Apps/Evolution/Building#Build_evolution-ews
2424 "-DWITH_MSPACK=ON"
25+ # don't try to install into ${evolution}
26+ "-DFORCE_INSTALL_PREFIX=ON"
2527 ];
2628
27− PKG_CONFIG_EVOLUTION_SHELL_3_0_ERRORDIR = "${placeholder "out"}/share/evolution/errors";
28− PKG_CONFIG_EVOLUTION_SHELL_3_0_PRIVLIBDIR = "${placeholder "out"}/lib/evolution";
29− PKG_CONFIG_CAMEL_1_2_CAMEL_PROVIDERDIR = "${placeholder "out"}/lib/evolution-data-server/camel-providers";
30− PKG_CONFIG_LIBEDATA_BOOK_1_2_BACKENDDIR = "${placeholder "out"}/lib/evolution-data-server/addressbook-backends";
31− PKG_CONFIG_LIBEDATA_CAL_2_0_BACKENDDIR = "${placeholder "out"}/lib/evolution-data-server/calendar-backends";
32− PKG_CONFIG_LIBEBACKEND_1_2_MODULEDIR = "${placeholder "out"}/lib/evolution-data-server/registry-modules";
33− PKG_CONFIG_EVOLUTION_SHELL_3_0_MODULEDIR = "${placeholder "out"}/lib/evolution/modules";
34− PKG_CONFIG_EVOLUTION_DATA_SERVER_1_2_PRIVDATADIR = "${placeholder "out"}/share/evolution-data-server";
35−
3629 passthru = {
3730 updateScript = gnome3.updateScript {
3831 packageName = "evolution-ews";
32+ versionPolicy = "odd-unstable";
3933 };
4034 };
4135
pkgs/applications/networking/mailreaders/evolution/evolution/default.nix+3−6
@@ -42,11 +42,11 @@
4242
4343stdenv.mkDerivation rec {
4444 pname = "evolution";
45− version = "3.38.4";
45+ version = "3.40.1";
4646
4747 src = fetchurl {
4848 url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
49− sha256 = "NB+S0k4rRMJ4mwA38aiU/xZUh9qksAuA+uMTii4Fr9Q=";
49+ sha256 = "07n4sbgsh0y9hrn52ymvy45ah65ll55gglgvqqi3h9nhkyy64y9g";
5050 };
5151
5252 nativeBuildInputs = [
@@ -114,13 +114,10 @@ stdenv.mkDerivation rec {
114114
115115 doCheck = true;
116116
117− patches = [
118− ./moduledir_from_env.patch
119− ];
120−
121117 passthru = {
122118 updateScript = gnome3.updateScript {
123119 packageName = "evolution";
120+ versionPolicy = "odd-unstable";
124121 };
125122 };
126123
pkgs/applications/networking/mailreaders/evolution/evolution/moduledir_from_env.patchdeleted−21
@@ -1,21 +0,0 @@
1−diff --git a/src/shell/main.c b/src/shell/main.c
2−index 5d089225ca..030908d684 100644
3−--- a/src/shell/main.c
4−+++ b/src/shell/main.c
5−@@ -407,7 +407,15 @@ create_default_shell (void)
6− }
7−
8− /* Load all shared library modules. */
9−- module_types = e_module_load_all_in_directory (EVOLUTION_MODULEDIR);
10−+ const gchar *modules_directory = EVOLUTION_MODULEDIR;
11−+ const gchar *modules_directory_env;
12−+
13−+ modules_directory_env = g_getenv ("EVOLUTION_MODULEDIR");
14−+ if (modules_directory_env &&
15−+ g_file_test (modules_directory_env, G_FILE_TEST_IS_DIR))
16−+ modules_directory = g_strdup (modules_directory_env);
17−+
18−+ module_types = e_module_load_all_in_directory (modules_directory);
19− g_list_free_full (module_types, (GDestroyNotify) g_type_module_unuse);
20−
21− flags = G_APPLICATION_HANDLES_OPEN |
pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix+1−7
@@ -10,13 +10,7 @@ symlinkJoin {
1010 for i in $out/bin/* $out/libexec/**; do
1111 if [ ! -d $i ]; then
1212 echo wrapping $i
13− wrapProgram $i \
14− --set LD_LIBRARY_PATH "$out/lib" \
15− --set EDS_ADDRESS_BOOK_MODULES "$out/lib/evolution-data-server/addressbook-backends/" \
16− --set EDS_CALENDAR_MODULES "$out/lib/evolution-data-server/calendar-backends/" \
17− --set EDS_CAMEL_PROVIDER_DIR "$out/lib/evolution-data-server/camel-providers/" \
18− --set EDS_REGISTRY_MODULES "$out/lib/evolution-data-server/registry-modules/" \
19− --set EVOLUTION_MODULEDIR "$out/lib/evolution/modules"
13+ wrapProgram $i --set EDS_EXTRA_PREFIXES "${lib.concatStringsSep ":" plugins}"
2014 fi
2115 done
2216
pkgs/applications/office/elementary-planner/default.nix+2
@@ -15,6 +15,7 @@
1515, glib-networking
1616, sqlite
1717, libsoup
18+, libgdata
1819, gtk3
1920, pantheon /* granite, icons, maintainers */
2021, webkitgtk
@@ -56,6 +57,7 @@ stdenv.mkDerivation rec {
5657 pantheon.granite
5758 sqlite
5859 webkitgtk
60+ libgdata # required by some dependency transitively
5961 ];
6062
6163 postPatch = ''
pkgs/applications/office/gnucash/default.nix+11−3
@@ -1,4 +1,4 @@
1−{ fetchurl, lib, stdenv, pkg-config, makeWrapper, cmake, gtest
1+{ fetchurl, fetchpatch, lib, stdenv, pkg-config, makeWrapper, cmake, gtest
22, boost, icu, libxml2, libxslt, gettext, swig, isocodes, gtk3, glibcLocales
33, webkitgtk, dconf, hicolor-icon-theme, libofx, aqbanking, gwenhywfar, libdbi
44, libdbiDrivers, guile, perl, perlPackages
@@ -25,13 +25,21 @@ in
2525
2626stdenv.mkDerivation rec {
2727 pname = "gnucash";
28− version = "4.4";
28+ version = "4.5";
2929
3030 src = fetchurl {
3131 url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2";
32− sha256 = "sha256-2R4NEmtGHXHeG8GyDZzxQnBDU97AfT5lmdE4QidZ5no=";
32+ sha256 = "sha256-vB9IqEU0iKLp9rg7aGE6pVyuvk0pg0YL2sfghLRs/9w=";
3333 };
3434
35+ patches = [
36+ # Fix build with GLib 2.68.
37+ (fetchpatch {
38+ url = "https://github.com/Gnucash/gnucash/commit/bbb4113a5a996dcd7bb3494e0be900b275b49a4f.patch";
39+ sha256 = "Pnvwoq5zutFw7ByduEEANiLM2J50WiXpm2aZ8B2MDMQ=";
40+ })
41+ ];
42+
3543 nativeBuildInputs = [ pkg-config makeWrapper cmake gtest ];
3644
3745 buildInputs = [
pkgs/applications/office/gnumeric/default.nix+1
@@ -29,6 +29,7 @@ in stdenv.mkDerivation rec {
2929 passthru = {
3030 updateScript = gnome3.updateScript {
3131 packageName = pname;
32+ versionPolicy = "odd-unstable";
3233 };
3334 };
3435
pkgs/applications/version-management/meld/default.nix+1
@@ -59,6 +59,7 @@ python3.pkgs.buildPythonApplication rec {
5959 passthru = {
6060 updateScript = gnome3.updateScript {
6161 packageName = pname;
62+ versionPolicy = "odd-unstable";
6263 };
6364 };
6465
pkgs/applications/video/pitivi/default.nix+3−3
@@ -21,13 +21,13 @@
2121
2222python3Packages.buildPythonApplication rec {
2323 pname = "pitivi";
24− version = "2020.09.2";
24+ version = "2021.01";
2525
2626 format = "other";
2727
2828 src = fetchurl {
29− url = "mirror://gnome/sources/pitivi/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
30− sha256 = "0hzvv4wia4rk0kvq16y27imq2qd4q5lg3vx99hdcjdb1x3zqqfg0";
29+ url = "mirror://gnome/sources/pitivi/${lib.versions.major version}/${pname}-${version}.tar.xz";
30+ sha256 = "0krzsrv19v3mwhbsm72ica6m3p8ijy0lbd0c3s87yd7pmbwld2c1";
3131 };
3232
3333 patches = [
pkgs/data/documentation/gnome-user-docs/default.nix+3−3
@@ -9,11 +9,11 @@
99
1010stdenv.mkDerivation rec {
1111 pname = "gnome-user-docs";
12− version = "3.38.2";
12+ version = "40.1";
1313
1414 src = fetchurl {
15− url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
16− sha256 = "1h9lyn80zccmgi6gpymabgrcj7km0sb1axll5z490qnx74xbn37m";
15+ url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
16+ sha256 = "09ld9r29nz64s04fmp3b2wwldmfnwxp4w36dkh7mbz5pdd3z7fwk";
1717 };
1818
1919 nativeBuildInputs = [
pkgs/data/fonts/cantarell-fonts/default.nix+5−7
@@ -1,14 +1,12 @@
11{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }:
22
3−let
3+stdenv.mkDerivation rec {
44 pname = "cantarell-fonts";
5− version = "0.111";
6−in stdenv.mkDerivation rec {
7− name = "${pname}-${version}";
5+ version = "0.301";
86
97 src = fetchurl {
10− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
11− sha256 = "05hpnhihwm9sxlq1qn993g03pwkmpjbn0dvnba71r1gfjv0jp2w5";
8+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9+ sha256 = "3d35db0ac03f9e6b0d5a53577591b714238985f4cfc31a0aa17f26cd74675e83";
1210 };
1311
1412 nativeBuildInputs = [ meson ninja gettext appstream-glib ];
@@ -21,7 +19,7 @@ in stdenv.mkDerivation rec {
2119
2220 outputHashAlgo = "sha256";
2321 outputHashMode = "recursive";
24− outputHash = "12ps2gjv1lmzbmkv16vgjmaahl3ayadpniyrx0z31sqn443r57hq";
22+ outputHash = "1sczskw2kv3qy39i9mzw2lkl94a90bjgv5ln9acy5kh4gb2zmy7z";
2523
2624 passthru = {
2725 updateScript = gnome3.updateScript {
pkgs/data/misc/mobile-broadband-provider-info/default.nix+8−3
@@ -1,14 +1,19 @@
1−{ lib, stdenv, fetchurl, gnome3 }:
1+{ lib, stdenv, fetchurl, gnome3, libxslt }:
22
33stdenv.mkDerivation rec {
44 pname = "mobile-broadband-provider-info";
5− version = "20190116";
5+ version = "20201225";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz";
9− sha256 = "16y5lc7pfdvai9c8xwb825zc3v46039gghbip13fqslf5gw11fic";
9+ sha256 = "1g9x2i4xjm2sagaha07n9psacbylrwfrmfqkp17gjwhpyi6w0zqd";
1010 };
1111
12+ nativeBuildInputs = [
13+ # fixes configure: error: xsltproc not found
14+ libxslt
15+ ];
16+
1217 passthru = {
1318 updateScript = gnome3.updateScript {
1419 packageName = pname;
pkgs/desktops/gnome-3/apps/accerciser/default.nix+1
@@ -60,6 +60,7 @@ python3.pkgs.buildPythonApplication rec {
6060 updateScript = gnome3.updateScript {
6161 packageName = "accerciser";
6262 attrPath = "gnome3.accerciser";
63+ versionPolicy = "odd-unstable";
6364 };
6465 };
6566
pkgs/desktops/gnome-3/apps/cheese/default.nix+27−23
@@ -1,6 +1,8 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, gettext
34, fetchurl
5+, fetchpatch
46, wrapGAppsHook
57, gnome-video-effects
68, libcanberra-gtk3
@@ -9,17 +11,13 @@
911, glib
1012, clutter-gtk
1113, clutter-gst
12−, udev
1314, gst_all_1
1415, itstool
15−, libgudev
1616, vala
1717, docbook_xml_dtd_43
18−, docbook_xsl
18+, docbook-xsl-nons
1919, appstream-glib
2020, libxslt
21−, yelp-tools
22−, gnome-common
2321, gtk-doc
2422, adwaita-icon-theme
2523, librsvg
@@ -38,37 +36,37 @@ stdenv.mkDerivation rec {
3836 pname = "cheese";
3937 version = "3.38.0";
4038
39+ outputs = [ "out" "man" "devdoc" ];
40+
4141 src = fetchurl {
4242 url = "mirror://gnome/sources/cheese/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
4343 sha256 = "0vyim2avlgq3a48rgdfz5g21kqk11mfb53b2l883340v88mp7ll8";
4444 };
4545
46− postPatch = ''
47− chmod +x meson_post_install.py
48− patchShebangs meson_post_install.py
49− '';
50−
51− passthru = {
52− updateScript = gnome3.updateScript { packageName = "cheese"; attrPath = "gnome3.cheese"; };
53− };
46+ patches = [
47+ # Fix build with latest Vala or GLib
48+ (fetchpatch {
49+ url = "https://gitlab.gnome.org/GNOME/cheese/commit/7cf6268e54620bbbe5e6e61800c50fb0cb4bea57.patch";
50+ sha256 = "WJgGNrpZLTahe7Sxr8HdTl+4Mf4VcmJb6DdiInlDcT4=";
51+ })
52+ ];
5453
5554 nativeBuildInputs = [
5655 appstream-glib
5756 docbook_xml_dtd_43
58− docbook_xsl
57+ docbook-xsl-nons
5958 gettext
60− gnome-common
6159 gtk-doc
6260 itstool
6361 libxml2
64− libxslt
62+ libxslt # for xsltproc
6563 meson
6664 ninja
6765 pkg-config
6866 python3
6967 vala
7068 wrapGAppsHook
71− yelp-tools
69+ glib # for glib-compile-schemas
7270 ];
7371
7472 buildInputs = [
@@ -86,12 +84,13 @@ stdenv.mkDerivation rec {
8684 gst_all_1.gstreamer
8785 gtk3
8886 libcanberra-gtk3
89− libgudev
9087 librsvg
91− udev
9288 ];
9389
94− outputs = [ "out" "man" "devdoc" ];
90+ postPatch = ''
91+ chmod +x meson_post_install.py
92+ patchShebangs meson_post_install.py
93+ '';
9594
9695 preFixup = ''
9796 gappsWrapperArgs+=(
@@ -105,13 +104,18 @@ stdenv.mkDerivation rec {
105104 )
106105 '';
107106
108− enableParallelBuilding = true;
107+ passthru = {
108+ updateScript = gnome3.updateScript {
109+ packageName = "cheese";
110+ attrPath = "gnome3.cheese";
111+ };
112+ };
109113
110114 meta = with lib; {
111115 homepage = "https://wiki.gnome.org/Apps/Cheese";
112116 description = "Take photos and videos with your webcam, with fun graphical effects";
113117 maintainers = teams.gnome.members;
114− license = licenses.gpl3;
118+ license = licenses.gpl2Plus;
115119 platforms = platforms.linux;
116120 };
117121}
pkgs/desktops/gnome-3/apps/file-roller/default.nix+11−4
@@ -1,20 +1,21 @@
11{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome3, gettext, itstool, libxml2, libarchive
2−, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }:
2+, file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales
3+, unzip, cpio }:
34
45stdenv.mkDerivation rec {
56 pname = "file-roller";
6− version = "3.38.1";
7+ version = "3.40.0";
78
89 src = fetchurl {
910 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "0mxwdbfqizakxq65fa8zlvjf48v5f44lv8ckjw8sl8fk2871784l";
11+ sha256 = "039w1dcpa5ypmv6sm634alk9vbcdkyvy595vkh5gn032jsiqca2a";
1112 };
1213
1314 LANG = "en_US.UTF-8"; # postinstall.py
1415
1516 nativeBuildInputs = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ];
1617
17− buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus ];
18+ buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus cpio ];
1819
1920 PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0";
2021
@@ -24,6 +25,12 @@ stdenv.mkDerivation rec {
2425 patchShebangs data/set-mime-type-entry.py
2526 '';
2627
28+ postFixup = ''
29+ # Workaround because of https://gitlab.gnome.org/GNOME/file-roller/issues/40
30+ wrapProgram "$out/bin/file-roller" \
31+ --prefix PATH : ${lib.makeBinPath [ unzip ]}
32+ '';
33+
2734 passthru = {
2835 updateScript = gnome3.updateScript {
2936 packageName = "file-roller";
pkgs/desktops/gnome-3/apps/gedit/default.nix+3−3
@@ -23,11 +23,11 @@
2323
2424stdenv.mkDerivation rec {
2525 pname = "gedit";
26− version = "3.38.1";
26+ version = "40.1";
2727
2828 src = fetchurl {
29− url = "mirror://gnome/sources/gedit/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
30− sha256 = "0kc48a399achcz6vlqq0jk0b8ixbrzyv9xb22s5av76m5hyqalq0";
29+ url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz";
30+ sha256 = "149ngl9qw6h59546lir1pa7hvw23ppsnqlj9mfqphmmn5jl99qsm";
3131 };
3232
3333 nativeBuildInputs = [
pkgs/desktops/gnome-3/apps/gnome-books/default.nix+5−6
@@ -18,7 +18,7 @@
1818, gdk-pixbuf
1919, gsettings-desktop-schemas
2020, adwaita-icon-theme
21−, docbook_xsl
21+, docbook-xsl-nons
2222, docbook_xml_dtd_42
2323, desktop-file-utils
2424, python3
@@ -28,11 +28,11 @@
2828
2929stdenv.mkDerivation rec {
3030 pname = "gnome-books";
31− version = "3.34.0";
31+ version = "40.0";
3232
3333 src = fetchurl {
34− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
35− sha256 = "153vknqisjn5f105avzm933fsc3v0pjzzbwxlqxf8vjjksh1cmya";
34+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
35+ sha256 = "0c41l8m2di8h39bmk2fnhpwglwp6qhljmwqqbihzp4ay9976zrc5";
3636 };
3737
3838 nativeBuildInputs = [
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
4242 gettext
4343 libxslt
4444 desktop-file-utils
45− docbook_xsl
45+ docbook-xsl-nons
4646 docbook_xml_dtd_42
4747 wrapGAppsHook
4848 python3
@@ -77,7 +77,6 @@ stdenv.mkDerivation rec {
7777 };
7878
7979 meta = with lib; {
80− broken = true; # Tracker 3 not supported and it cannot start Tracker 2.
8180 homepage = "https://wiki.gnome.org/Apps/Books";
8281 description = "An e-book manager application for GNOME";
8382 maintainers = teams.gnome.members;
pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix+6−6
@@ -19,7 +19,7 @@
1919, python3
2020, appstream-glib
2121, spice-protocol
22−, libhandy_0
22+, libhandy
2323, libsoup
2424, libosinfo
2525, systemd
@@ -53,11 +53,11 @@
5353
5454stdenv.mkDerivation rec {
5555 pname = "gnome-boxes";
56− version = "3.38.2";
56+ version = "40.1";
5757
5858 src = fetchurl {
59− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
60− sha256 = "1zjvng0izbws3506998l3dwsxjbm7wnhqipb8nmqzvi096czvajl";
59+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
60+ sha256 = "seKPLH+3a/T7uGLQ1S6BG5TL6f8W8GdAiWRWhpCILvg=";
6161 };
6262
6363 doCheck = true;
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
9999 libcap
100100 libcap_ng
101101 libgudev
102− libhandy_0
102+ libhandy
103103 libosinfo
104104 librsvg
105105 libsecret
@@ -138,7 +138,7 @@ stdenv.mkDerivation rec {
138138 meta = with lib; {
139139 description = "Simple GNOME 3 application to access remote or virtual systems";
140140 homepage = "https://wiki.gnome.org/Apps/Boxes";
141− license = licenses.gpl3;
141+ license = licenses.lgpl2Plus;
142142 platforms = platforms.linux;
143143 maintainers = teams.gnome.members;
144144 };
pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix+5−14
@@ -1,6 +1,5 @@
11{ lib, stdenv
22, fetchurl
3−, fetchpatch
43, meson
54, ninja
65, pkg-config
@@ -25,25 +24,17 @@
2524
2625stdenv.mkDerivation rec {
2726 pname = "gnome-calendar";
28− version = "3.38.2";
27+ version = "40.0";
2928
3029 src = fetchurl {
31− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
32− sha256 = "0SG7NLCLbqYB9du6Q6SxYTpuVJP8Cx4uzJDGZnEakS0=";
30+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
31+ sha256 = "0d74hng9jdmwdcjgj4xfrcink2gwkbp1k1mad4wanaf7q31c6f38";
3332 };
3433
3534 patches = [
36− # Port to libhandy-1
37− (fetchpatch {
38− url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/commit/8be361b6ce8f0f8053e1609decbdbdc164ec8448.patch";
39− sha256 = "Ue0pWwcbYyCZPHPPoR0dXW5n948/AZ3wVDMTIZDOnyE=";
40− })
41−
4235 # https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84
43− (fetchpatch {
44− url = "https://gitlab.gnome.org/GNOME/gnome-calendar/-/merge_requests/84.patch";
45− sha256 = "czG3uIHl3tBnjDUvCOPm8IRp2o7yZYCb0/jWtv3uzIY=";
46− })
36+ # A refactor has caused the PR patch to drift enough to need rebasing
37+ ./gtk_image_reset_crash.patch
4738 ];
4839
4940 passthru = {
pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patchnew file+17
@@ -0,0 +1,17 @@
1+diff --git a/src/gui/views/gcal-year-view.c b/src/gui/views/gcal-year-view.c
2+index ac32a8f9..532425c1 100644
3+--- a/src/gui/views/gcal-year-view.c
4++++ b/src/gui/views/gcal-year-view.c
5+@@ -2158,7 +2158,11 @@ update_weather (GcalYearView *self)
6+ if (!updated)
7+ {
8+ gtk_label_set_text (self->temp_label, "");
9+- gtk_image_clear (self->weather_icon);
10++ /* FIXME: This should never be NULL, but it somehow is.
11++ * https://gitlab.gnome.org/GNOME/gnome-calendar/issues/299
12++ */
13++ if (self->weather_icon != NULL)
14++ gtk_image_clear (self->weather_icon);
15+ }
16+ }
17+
pkgs/desktops/gnome-3/apps/gnome-characters/default.nix+9−6
@@ -1,4 +1,5 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchurl
34, meson
45, ninja
@@ -13,6 +14,7 @@
1314, gobject-introspection
1415, gjs
1516, libunistring
17+, libhandy
1618, gsettings-desktop-schemas
1719, adwaita-icon-theme
1820, gnome-desktop
@@ -20,11 +22,11 @@
2022
2123stdenv.mkDerivation rec {
2224 pname = "gnome-characters";
23− version = "3.34.0";
25+ version = "40.0";
2426
2527 src = fetchurl {
26− url = "mirror://gnome/sources/gnome-characters/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
27− sha256 = "0mqaxsa7hcmvid3zbzvxpfkp7s01ghiq6kaibmd3169axrr8ahql";
28+ url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz";
29+ sha256 = "0z2xa4w921bzpzj6gv88pvbrijcnnwni6jxynwz0ybaravyzaqha";
2830 };
2931
3032 nativeBuildInputs = [
@@ -46,6 +48,7 @@ stdenv.mkDerivation rec {
4648 gsettings-desktop-schemas
4749 gtk3
4850 libunistring
51+ libhandy
4952 pango
5053 ];
5154
@@ -76,10 +79,10 @@ stdenv.mkDerivation rec {
7679 };
7780
7881 meta = with lib; {
79− homepage = "https://wiki.gnome.org/Design/Apps/CharacterMap";
82+ homepage = "https://wiki.gnome.org/Apps/Characters";
8083 description = "Simple utility application to find and insert unusual characters";
8184 maintainers = teams.gnome.members;
82− license = licenses.gpl2;
85+ license = licenses.gpl2Plus;
8386 platforms = platforms.linux;
8487 };
8588}
pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix+3−3
@@ -27,11 +27,11 @@
2727
2828stdenv.mkDerivation rec {
2929 pname = "gnome-clocks";
30− version = "3.38.0";
30+ version = "40.0";
3131
3232 src = fetchurl {
33− url = "mirror://gnome/sources/gnome-clocks/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
34− sha256 = "0f24g76ax59qnms1rjfyf1i0sa84nadgbr0r6m26p90w1w2wnmnr";
33+ url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz";
34+ sha256 = "02d3jg46sn8d9gd4dsaly22gg5vkbz2gpq4pmwpvncb4rsqk7sn2";
3535 };
3636
3737 nativeBuildInputs = [
pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nixdeleted−25
@@ -1,25 +0,0 @@
1−{ lib, stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
2−
3−stdenv.mkDerivation rec {
4− pname = "gnome-getting-started-docs";
5− version = "3.38.1";
6−
7− src = fetchurl {
8− url = "mirror://gnome/sources/gnome-getting-started-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "EPviPyw85CdTmk4wekYWlNOHCyMgBGT3BbfYGvmTyFk=";
10− };
11−
12− passthru = {
13− updateScript = gnome3.updateScript { packageName = "gnome-getting-started-docs"; attrPath = "gnome3.gnome-getting-started-docs"; };
14− };
15−
16− buildInputs = [ intltool itstool libxml2 ];
17−
18− meta = with lib; {
19− homepage = "https://live.gnome.org/DocumentationProject";
20− description = "Help a new user get started in GNOME";
21− maintainers = teams.gnome.members;
22− license = licenses.cc-by-sa-30;
23− platforms = platforms.linux;
24− };
25−}
pkgs/desktops/gnome-3/apps/gnome-maps/default.nix+8−3
@@ -29,11 +29,11 @@
2929
3030stdenv.mkDerivation rec {
3131 pname = "gnome-maps";
32− version = "3.38.4";
32+ version = "40.1";
3333
3434 src = fetchurl {
35− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
36− sha256 = "sha256-1WQekf/kePsqqcpIliJczxjsLqTZjjV2UXmBin2+RKM=";
35+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
36+ sha256 = "sha256-mAXUwFs6NpV0bTdisoFr/+bZ19VuF7y7nZ1B3C0CYxo=";
3737 };
3838
3939 doCheck = true;
@@ -82,6 +82,11 @@ stdenv.mkDerivation rec {
8282 "Exec=$out/bin/gnome-maps"
8383 '';
8484
85+ preCheck = ''
86+ # “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema.
87+ export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS"
88+ '';
89+
8590 passthru = {
8691 updateScript = gnome3.updateScript {
8792 packageName = pname;
pkgs/desktops/gnome-3/apps/gnome-music/default.nix+3−3
@@ -30,13 +30,13 @@
3030
3131python3.pkgs.buildPythonApplication rec {
3232 pname = "gnome-music";
33− version = "3.38.2";
33+ version = "40.0";
3434
3535 format = "other";
3636
3737 src = fetchurl {
38− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
39− sha256 = "0c2051wngf3jrifl5bv5kyqcci459n62vixxkryiryjcaqwbd1am";
38+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
39+ sha256 = "1djqhd4jccvk352hwxjhiwjgbnv1qnpv450f2c6w6581vcn9pq38";
4040 };
4141
4242 nativeBuildInputs = [
pkgs/desktops/gnome-3/apps/gnome-notes/default.nix+9−8
@@ -12,10 +12,11 @@
1212, gtk3
1313, evolution-data-server
1414, gnome-online-accounts
15+, json-glib
1516, libuuid
16−, libhandy_0
17+, curl
18+, libhandy
1719, webkitgtk
18−, zeitgeist
1920, gnome3
2021, libxml2
2122, gsettings-desktop-schemas
@@ -24,11 +25,11 @@
2425
2526stdenv.mkDerivation rec {
2627 pname = "gnome-notes";
27− version = "3.38.0";
28+ version = "40.1";
2829
2930 src = fetchurl {
30− url = "mirror://gnome/sources/bijiben/${lib.versions.majorMinor version}/bijiben-${version}.tar.xz";
31− sha256 = "H/bMCsbGKQe/KgmhchXt0vF7dNrKs6XIminDBJFyvis=";
31+ url = "mirror://gnome/sources/bijiben/${lib.versions.major version}/bijiben-${version}.tar.xz";
32+ sha256 = "1gvvb2klkzbmyzwkjgmscdiqcl8lyz9b0rxb4igjz079csq6z805";
3233 };
3334
3435 doCheck = true;
@@ -53,19 +54,19 @@ stdenv.mkDerivation rec {
5354 buildInputs = [
5455 glib
5556 gtk3
57+ json-glib
5658 libuuid
57− libhandy_0 # doesn't support libhandy-1 yet
59+ curl
60+ libhandy
5861 webkitgtk
5962 tracker
6063 gnome-online-accounts
61− zeitgeist
6264 gsettings-desktop-schemas
6365 evolution-data-server
6466 gnome3.adwaita-icon-theme
6567 ];
6668
6769 mesonFlags = [
68− "-Dzeitgeist=true"
6970 "-Dupdate_mimedb=false"
7071 ];
7172
pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix+3−3
@@ -19,11 +19,11 @@
1919
2020stdenv.mkDerivation rec {
2121 pname = "gnome-sound-recorder";
22− version = "3.38.1";
22+ version = "40.0";
2323
2424 src = fetchurl {
25− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
26− sha256 = "2Z6k+WPsEInpzVl6fUQ5ihHs7xMeQUInGhyQwVuqRSE=";
25+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
26+ sha256 = "00b55vsfzx877b7mj744abzjws7zclz71wbvh0axsrbl9l84ranl";
2727 };
2828
2929 nativeBuildInputs = [
pkgs/desktops/gnome-3/apps/gnome-weather/default.nix+38−8
@@ -1,19 +1,49 @@
1−{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection
2−, libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, pkg-config
5+, gnome3
6+, gtk3
7+, libhandy
8+, wrapGAppsHook
9+, gjs
10+, gobject-introspection
11+, libgweather
12+, meson
13+, ninja
14+, geoclue2
15+, gnome-desktop
16+, python3
17+, gsettings-desktop-schemas
18+}:
319
420stdenv.mkDerivation rec {
521 pname = "gnome-weather";
6− version = "3.36.1";
22+ version = "40.0";
723
824 src = fetchurl {
9− url = "mirror://gnome/sources/gnome-weather/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "11z75ky6xp9hx7lm24xng7ydr20bzh4d6p9sbi9c8ccz2m3fdrk8";
25+ url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz";
26+ sha256 = "1vxfcvga5waangq3rzwdrdxyy5sw40vv0l463lc651s0n8xafd9a";
1127 };
1228
13− nativeBuildInputs = [ pkg-config meson ninja wrapGAppsHook python3 ];
29+ nativeBuildInputs = [
30+ pkg-config
31+ meson
32+ ninja
33+ wrapGAppsHook
34+ python3
35+ ];
36+
1437 buildInputs = [
15− gtk3 gjs gobject-introspection gnome-desktop
16− libgweather gnome3.adwaita-icon-theme geoclue2 gsettings-desktop-schemas
38+ gtk3
39+ libhandy
40+ gjs
41+ gobject-introspection
42+ gnome-desktop
43+ libgweather
44+ gnome3.adwaita-icon-theme
45+ geoclue2
46+ gsettings-desktop-schemas
1747 ];
1848
1949 postPatch = ''
pkgs/desktops/gnome-3/apps/seahorse/default.nix+3−3
@@ -26,11 +26,11 @@
2626
2727stdenv.mkDerivation rec {
2828 pname = "seahorse";
29− version = "3.38.0.1";
29+ version = "40.0";
3030
3131 src = fetchurl {
32− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
33− hash = "sha256-x0XdHebhog8ZorB6Q4uO98yiNaaqc0ENt/E3sCHpsqI=";
32+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
33+ hash = "sha256-fscFezhousbqBB/aghQKOfXsnlsYi0UJFNRTvC1V0Cw=";
3434 };
3535
3636 doCheck = true;
pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix+3−3
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "adwaita-icon-theme";
6− version = "3.38.0";
6+ version = "40.1.1";
77
88 src = fetchurl {
9− url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "15xgz9wzk07442x3s3052as95g0223z4pp9qlsgcs323yama30v6";
9+ url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/${pname}-${version}.tar.xz";
10+ sha256 = "C2xDbtatmIeoitofcqAZex63OwINjTRKurTH+nJQ+PY=";
1111 };
1212
1313 # For convenience, we can specify adwaita-icon-theme only in packages
pkgs/desktops/gnome-3/core/baobab/default.nix+42−12
@@ -1,20 +1,50 @@
1−{ lib, stdenv, gettext, fetchurl, vala, desktop-file-utils
2−, meson, ninja, pkg-config, python3, gtk3, glib, libxml2
3−, wrapGAppsHook, itstool, gnome3 }:
1+{ stdenv
2+, lib
3+, gettext
4+, fetchurl
5+, vala
6+, desktop-file-utils
7+, meson
8+, ninja
9+, pkg-config
10+, python3
11+, gtk3
12+, libhandy
13+, glib
14+, libxml2
15+, wrapGAppsHook
16+, itstool
17+, gnome3
18+}:
419
5−let
20+stdenv.mkDerivation rec {
621 pname = "baobab";
7− version = "3.38.0";
8−in stdenv.mkDerivation rec {
9− name = "${pname}-${version}";
22+ version = "40.0";
1023
1124 src = fetchurl {
12− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "0ac3fbl15l836yvgw724q4whbkws9v4b6l2xy6bnp0b0g0a6i104";
25+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
26+ sha256 = "19yii3bdgivxrcka1c4g6dpbmql5nyawwhzlsph7z6bs68nambm6";
1427 };
1528
16− nativeBuildInputs = [ meson ninja pkg-config vala gettext itstool libxml2 desktop-file-utils wrapGAppsHook python3 ];
17− buildInputs = [ gtk3 glib gnome3.adwaita-icon-theme ];
29+ nativeBuildInputs = [
30+ meson
31+ ninja
32+ pkg-config
33+ vala
34+ gettext
35+ itstool
36+ libxml2
37+ desktop-file-utils
38+ wrapGAppsHook
39+ python3
40+ ];
41+
42+ buildInputs = [
43+ gtk3
44+ libhandy
45+ glib
46+ gnome3.adwaita-icon-theme
47+ ];
1848
1949 doCheck = true;
2050
@@ -27,7 +57,7 @@ in stdenv.mkDerivation rec {
2757 meta = with lib; {
2858 description = "Graphical application to analyse disk usage in any GNOME environment";
2959 homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer";
30− license = licenses.gpl2;
60+ license = licenses.gpl2Plus;
3161 maintainers = teams.gnome.members;
3262 platforms = platforms.linux;
3363 };
pkgs/desktops/gnome-3/core/dconf-editor/default.nix+41−8
@@ -1,21 +1,51 @@
1−{ lib, stdenv, fetchurl, meson, ninja, vala, libxslt, pkg-config, glib, gtk3, gnome3, python3, dconf
2−, libxml2, gettext, docbook_xsl, wrapGAppsHook, gobject-introspection }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, meson
5+, ninja
6+, vala
7+, libxslt
8+, pkg-config
9+, glib
10+, gtk3
11+, gnome3
12+, python3
13+, dconf
14+, libxml2
15+, gettext
16+, docbook-xsl-nons
17+, wrapGAppsHook
18+, gobject-introspection
19+}:
320
421stdenv.mkDerivation rec {
522 pname = "dconf-editor";
6− version = "3.38.2";
23+ version = "3.38.3";
724
825 src = fetchurl {
926 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "sha256-ElPa2H5iE/vzE/+eydxDWKobECYfKAcsHcDgmXuS+DU=";
27+ sha256 = "sha256-Vxr0x9rU8Em1PmzXKLea3fCMJ92ra8V7OW0hGGbueeM=";
1128 };
1229
1330 nativeBuildInputs = [
14− meson ninja vala libxslt pkg-config wrapGAppsHook
15− gettext docbook_xsl libxml2 gobject-introspection python3
31+ meson
32+ ninja
33+ vala
34+ libxslt
35+ pkg-config
36+ wrapGAppsHook
37+ gettext
38+ docbook-xsl-nons
39+ libxml2
40+ gobject-introspection
41+ python3
1642 ];
1743
18− buildInputs = [ glib gtk3 dconf ];
44+ buildInputs = [
45+ glib
46+ gtk3
47+ dconf
48+ ];
1949
2050 postPatch = ''
2151 chmod +x meson_post_install.py
@@ -30,7 +60,10 @@ stdenv.mkDerivation rec {
3060 };
3161
3262 meta = with lib; {
33− platforms = platforms.linux;
63+ description = "GSettings editor for GNOME";
64+ homepage = "https://wiki.gnome.org/Apps/DconfEditor";
65+ license = licenses.gpl3Plus;
3466 maintainers = teams.gnome.members;
67+ platforms = platforms.linux;
3568 };
3669}
pkgs/desktops/gnome-3/core/eog/default.nix+3−3
@@ -28,11 +28,11 @@
2828
2929stdenv.mkDerivation rec {
3030 pname = "eog";
31− version = "3.38.2";
31+ version = "40.1";
3232
3333 src = fetchurl {
34− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
35− sha256 = "sha256-ilT9+T4wag9khToYgxrIwEg4IEdxBqrgvcAKrDc4bw4=";
34+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
35+ sha256 = "sha256-e+CGA3/tm2v4S6yXqD48kYMBt+nJavEwsnJS0KURFok=";
3636 };
3737
3838 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/epiphany/default.nix+11−9
@@ -19,6 +19,7 @@
1919, libsecret
2020, gnome-desktop
2121, libnotify
22+, libarchive
2223, p11-kit
2324, sqlite
2425, gcr
@@ -36,18 +37,13 @@
3637
3738stdenv.mkDerivation rec {
3839 pname = "epiphany";
39− version = "3.38.2";
40+ version = "40.1";
4041
4142 src = fetchurl {
42− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
43− sha256 = "0v8iymg72m83ikxxyhapvz5v8zh8hlr1pw7n215cy3p8q6yg41cb";
43+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
44+ sha256 = "1l0sb1xg16g4wg3z99xb0w2kbyczbn7q4mphs3w4lxq22xml4sk9";
4445 };
4546
46− # Tests need an X display
47− mesonFlags = [
48− "-Dunit_tests=disabled"
49− ];
50−
5147 nativeBuildInputs = [
5248 desktop-file-utils
5349 gettext
@@ -83,6 +79,7 @@ stdenv.mkDerivation rec {
8379 libhandy
8480 libportal
8581 libnotify
82+ libarchive
8683 libsecret
8784 libsoup
8885 libxml2
@@ -92,6 +89,11 @@ stdenv.mkDerivation rec {
9289 webkitgtk
9390 ];
9491
92+ # Tests need an X display
93+ mesonFlags = [
94+ "-Dunit_tests=disabled"
95+ ];
96+
9597 postPatch = ''
9698 chmod +x post_install.py # patchShebangs requires executable file
9799 patchShebangs post_install.py
@@ -107,7 +109,7 @@ stdenv.mkDerivation rec {
107109 homepage = "https://wiki.gnome.org/Apps/Epiphany";
108110 description = "WebKit based web browser for GNOME";
109111 maintainers = teams.gnome.members;
110− license = licenses.gpl2;
112+ license = licenses.gpl3Plus;
111113 platforms = platforms.linux;
112114 };
113115}
pkgs/desktops/gnome-3/core/evince/default.nix+5−3
@@ -19,6 +19,7 @@
1919, djvulibre
2020, libspectre
2121, libarchive
22+, libhandy
2223, libsecret
2324, wrapGAppsHook
2425, librsvg
@@ -43,13 +44,13 @@
4344
4445stdenv.mkDerivation rec {
4546 pname = "evince";
46− version = "3.38.2";
47+ version = "40.1";
4748
4849 outputs = [ "out" "dev" "devdoc" ];
4950
5051 src = fetchurl {
51− url = "mirror://gnome/sources/evince/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
52− sha256 = "J9QZ1f7WMF4HRijtz94MtzT//aIF1jysMjORwEkDvZQ=";
52+ url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz";
53+ sha256 = "0bfg7prmjk3z8irx1nfkkqph3igg3cy4pwd7pcxjxbshqdin6rks";
5354 };
5455
5556 postPatch = ''
@@ -86,6 +87,7 @@ stdenv.mkDerivation rec {
8687 gspell
8788 gtk3
8889 libarchive
90+ libhandy
8991 librsvg
9092 libsecret
9193 libspectre
pkgs/desktops/gnome-3/core/evolution-data-server/default.nix+3−2
@@ -6,13 +6,13 @@
66
77stdenv.mkDerivation rec {
88 pname = "evolution-data-server";
9− version = "3.38.4";
9+ version = "3.40.1";
1010
1111 outputs = [ "out" "dev" ];
1212
1313 src = fetchurl {
1414 url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
15− sha256 = "rFPxay1R8+f/gCX5yhn0otTOOEHXKun+K7iX3ICZ1wU=";
15+ sha256 = "08iykha7zhk21b3axsp3v1jfwda612v0m8rz8zlzppm5i8s5ziza";
1616 };
1717
1818 patches = [
@@ -52,6 +52,7 @@ stdenv.mkDerivation rec {
5252 passthru = {
5353 updateScript = gnome3.updateScript {
5454 packageName = "evolution-data-server";
55+ versionPolicy = "odd-unstable";
5556 };
5657 };
5758
pkgs/desktops/gnome-3/core/gdm/default.nix+9−6
@@ -42,13 +42,13 @@ in
4242
4343stdenv.mkDerivation rec {
4444 pname = "gdm";
45− version = "3.38.2.1";
45+ version = "40.0";
4646
4747 outputs = [ "out" "dev" ];
4848
4949 src = fetchurl {
50− url = "mirror://gnome/sources/gdm/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
51− sha256 = "yliiBdXr/L2rVqEXFriY4Wrl3/Ia7nnQdgRkRGKOxNo=";
50+ url = "mirror://gnome/sources/gdm/${lib.versions.major version}/${pname}-${version}.tar.xz";
51+ sha256 = "XtdLc506Iy/7HkoTK8+WW9/pVdmVtSh3NYh3WwLylQ4=";
5252 };
5353
5454 mesonFlags = [
@@ -90,10 +90,13 @@ stdenv.mkDerivation rec {
9090 ];
9191
9292 patches = [
93− # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/112
93+ # GDM fails to find g-s with the following error in the journal.
94+ # gdm-x-session[976]: dbus-run-session: failed to exec 'gnome-session': No such file or directory
95+ # https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/92
9496 (fetchpatch {
95− url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/1d28d4b3568381b8590d2235737b924aefd1746c.patch";
96− sha256 = "ZUXKZS4T0o0hzrApxaqcR0txCRv5zBgqeQ9K9fLNX1o=";
97+ url = "https://gitlab.gnome.org/GNOME/gdm/-/commit/ccecd9c975d04da80db4cd547b67a1a94fa83292.patch";
98+ sha256 = "5hKS9wjjhuSAYwXct5vS0dPbmPRIINJoLC0Zm1naz6Q=";
99+ revert = true;
97100 })
98101
99102 # Change hardcoded paths to nix store paths.
pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix+3−3
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnome-backgrounds";
5− version = "3.38.0";
5+ version = "40.1";
66
77 src = fetchurl {
8− url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "1qqygm15rcdgm36vz2iy7b9axndjzvpi29lmygyakjc07a3jlwgp";
8+ url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz";
9+ sha256 = "YN+KDaMBzkJbcEPUKuMuxAEf8I8Y4Pxi8pQBMF2jpw4=";
1010 };
1111
1212 passthru = {
pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix+48−14
@@ -1,28 +1,62 @@
1−{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, gtk3, intltool, glib
2−, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection
3−, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, gnome3
5+, meson
6+, ninja
7+, pkg-config
8+, gtk3
9+, gettext
10+, glib
11+, udev
12+, itstool
13+, libxml2
14+, wrapGAppsHook
15+, libnotify
16+, libcanberra-gtk3
17+, gobject-introspection
18+, gtk-doc
19+, docbook-xsl-nons
20+, docbook_xml_dtd_43
21+, python3
22+, gsettings-desktop-schemas
23+}:
424
5−let
25+stdenv.mkDerivation rec {
626 pname = "gnome-bluetooth";
7−in stdenv.mkDerivation rec {
8− name = "${pname}-${version}";
9− version = "3.34.3";
27+ version = "3.34.5";
1028
1129 # TODO: split out "lib"
1230 outputs = [ "out" "dev" "devdoc" "man" ];
1331
1432 src = fetchurl {
15− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
16− sha256 = "08k4jak4r72pvn5kjhm21planyc514j6c7jjj5lv9nmvvlxqw1ha";
33+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
34+ sha256 = "1a9ynlwwkb3wpg293ym517vmrkk63y809mmcv9a21k5yr199x53c";
1735 };
1836
1937 nativeBuildInputs = [
20− meson ninja intltool itstool pkg-config libxml2 wrapGAppsHook gobject-introspection
21− gtk-doc docbook_xsl docbook_xml_dtd_43 python3
38+ meson
39+ ninja
40+ gettext
41+ itstool
42+ pkg-config
43+ libxml2
44+ wrapGAppsHook
45+ gobject-introspection
46+ gtk-doc
47+ docbook-xsl-nons
48+ docbook_xml_dtd_43
49+ python3
2250 ];
51+
2352 buildInputs = [
24− glib gtk3 udev libnotify libcanberra-gtk3
25− gnome3.adwaita-icon-theme gsettings-desktop-schemas
53+ glib
54+ gtk3
55+ udev
56+ libnotify
57+ libcanberra-gtk3
58+ gnome3.adwaita-icon-theme
59+ gsettings-desktop-schemas
2660 ];
2761
2862 mesonFlags = [
@@ -46,7 +80,7 @@ in stdenv.mkDerivation rec {
4680 homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en";
4781 description = "Application that let you manage Bluetooth in the GNOME destkop";
4882 maintainers = teams.gnome.members;
49− license = licenses.gpl2;
83+ license = licenses.gpl2Plus;
5084 platforms = platforms.linux;
5185 };
5286}
pkgs/desktops/gnome-3/core/gnome-calculator/default.nix+54−11
@@ -1,25 +1,63 @@
1−{ lib, stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkg-config, libxml2
2−, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3
3−, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas, libgee }:
1+{ stdenv
2+, lib
3+, meson
4+, ninja
5+, vala
6+, gettext
7+, itstool
8+, fetchurl
9+, pkg-config
10+, libxml2
11+, gtk3
12+, glib
13+, gtksourceview4
14+, wrapGAppsHook
15+, gobject-introspection
16+, python3
17+, gnome3
18+, mpfr
19+, gmp
20+, libsoup
21+, libmpc
22+, libhandy
23+, gsettings-desktop-schemas
24+, libgee
25+}:
426
527stdenv.mkDerivation rec {
628 pname = "gnome-calculator";
7− version = "3.38.2";
29+ version = "40.1";
830
931 src = fetchurl {
10− url = "mirror://gnome/sources/gnome-calculator/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "0sri58cp6v07cqpdsf8dhf9dnykz305kvkx0l9dd25g06djcr0wc";
32+ url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz";
33+ sha256 = "1xkazxbkpn1z5pfphhps7fc5q4yc8lp7f6b222n8bx5iyxhwbrkz";
1234 };
1335
1436 nativeBuildInputs = [
15− meson ninja pkg-config vala gettext itstool wrapGAppsHook python3
37+ meson
38+ ninja
39+ pkg-config
40+ vala
41+ gettext
42+ itstool
43+ wrapGAppsHook
44+ python3
1645 gobject-introspection # for finding vapi files
1746 ];
1847
1948 buildInputs = [
20− gtk3 glib libxml2 gtksourceview4 mpfr gmp
21− gnome3.adwaita-icon-theme libgee
22− gsettings-desktop-schemas libsoup libmpc
49+ gtk3
50+ glib
51+ libxml2
52+ gtksourceview4
53+ mpfr
54+ gmp
55+ gnome3.adwaita-icon-theme
56+ libgee
57+ gsettings-desktop-schemas
58+ libsoup
59+ libmpc
60+ libhandy
2361 ];
2462
2563 doCheck = true;
@@ -29,6 +67,11 @@ stdenv.mkDerivation rec {
2967 patchShebangs meson_post_install.py
3068 '';
3169
70+ preCheck = ''
71+ # Currency conversion test tries to store currency data in $HOME/.cache.
72+ export HOME=$TMPDIR
73+ '';
74+
3275 passthru = {
3376 updateScript = gnome3.updateScript {
3477 packageName = "gnome-calculator";
@@ -40,7 +83,7 @@ stdenv.mkDerivation rec {
4083 homepage = "https://wiki.gnome.org/Apps/Calculator";
4184 description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
4285 maintainers = teams.gnome.members;
43− license = licenses.gpl3;
86+ license = licenses.gpl3Plus;
4487 platforms = platforms.linux;
4588 };
4689}
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix+5−3
@@ -17,6 +17,7 @@
1717, gnome-online-accounts
1818, wrapGAppsHook
1919, folks
20+, libgdata
2021, libxml2
2122, gnome3
2223, vala
@@ -28,11 +29,11 @@
2829
2930stdenv.mkDerivation rec {
3031 pname = "gnome-contacts";
31− version = "3.38.1";
32+ version = "40.0";
3233
3334 src = fetchurl {
34− url = "mirror://gnome/sources/gnome-contacts/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
35− sha256 = "0hsq0dwxjahcaxnm1m4r1lync9k2fkwzybfmkchrmn95vqcwwvf9";
35+ url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz";
36+ sha256 = "0w2g5xhw65adzvwzakrj5kaim4sw1w7s8qqwm3nm6inq50znzpn9";
3637 };
3738
3839 propagatedUserEnvPkgs = [
@@ -58,6 +59,7 @@ stdenv.mkDerivation rec {
5859 evolution-data-server
5960 gsettings-desktop-schemas
6061 folks
62+ libgdata # required by some dependency transitively
6163 gnome-desktop
6264 libhandy
6365 libxml2
pkgs/desktops/gnome-3/core/gnome-control-center/default.nix+24−21
@@ -1,6 +1,7 @@
11{ fetchurl
2−, fetchFromGitLab
3−, lib, stdenv
2+, fetchpatch
3+, lib
4+, stdenv
45, substituteAll
56, accountsservice
67, adwaita-icon-theme
@@ -10,7 +11,7 @@
1011, colord
1112, colord-gtk
1213, cups
13−, docbook_xsl
14+, docbook-xsl-nons
1415, fontconfig
1516, gdk-pixbuf
1617, gettext
@@ -69,20 +70,32 @@
6970
7071stdenv.mkDerivation rec {
7172 pname = "gnome-control-center";
72− version = "3.38.4";
73+ version = "40.0";
7374
7475 src = fetchurl {
75− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
76− sha256 = "sha256-SdxjeNTTXBxu1ZIk9WNpFsK2+km7+4tW6xmoTW6QzRk=";
76+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
77+ sha256 = "sha256-zMmlc2UXOFEJrlpZkGwlgkTdh5t1A61ZhM9BZVyzAvE=";
7778 };
7879
79− # See https://mail.gnome.org/archives/distributor-list/2020-September/msg00001.html
80− prePatch = (import ../gvc-with-ucm-prePatch.nix {
81− inherit fetchFromGitLab;
82− });
80+ patches = [
81+ (substituteAll {
82+ src = ./paths.patch;
83+ gcm = gnome-color-manager;
84+ gnome_desktop = gnome-desktop;
85+ inherit glibc libgnomekbd tzdata;
86+ inherit cups networkmanagerapplet;
87+ })
88+
89+ # Fix startup assertion in power panel.
90+ # https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/974
91+ (fetchpatch {
92+ url = "https://gitlab.gnome.org/GNOME/gnome-control-center/commit/9acaa10567c94048657c69538e5d7813f82c4224.patch";
93+ sha256 = "59GeTPcG2UiVTL4VTS/TP0p0QkAQpm3VgvuAiw64wUU=";
94+ })
95+ ];
8396
8497 nativeBuildInputs = [
85− docbook_xsl
98+ docbook-xsl-nons
8699 gettext
87100 libxslt
88101 meson
@@ -142,16 +155,6 @@ stdenv.mkDerivation rec {
142155 upower
143156 ];
144157
145− patches = [
146− (substituteAll {
147− src = ./paths.patch;
148− gcm = gnome-color-manager;
149− gnome_desktop = gnome-desktop;
150− inherit glibc libgnomekbd tzdata;
151− inherit cups networkmanagerapplet;
152− })
153− ];
154−
155158 postPatch = ''
156159 chmod +x build-aux/meson/meson_post_install.py # patchShebangs requires executable file
157160 patchShebangs build-aux/meson/meson_post_install.py
pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch+48−46
@@ -1,26 +1,26 @@
11diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
2−index 49ca35220..adefb87b9 100644
2+index 603178efc..c363a6a5c 100644
33--- a/panels/color/cc-color-panel.c
44+++ b/panels/color/cc-color-panel.c
5−@@ -599,7 +599,7 @@ gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs)
5+@@ -591,7 +591,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs)
66
77 /* run with modal set */
88 argv = g_ptr_array_new_with_free_func (g_free);
9−- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL));
9+- g_ptr_array_add (argv, g_strdup ("gcm-calibrate"));
1010+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL));
1111 g_ptr_array_add (argv, g_strdup ("--device"));
1212 g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device)));
1313 g_ptr_array_add (argv, g_strdup ("--parent-window"));
14−@@ -1038,7 +1038,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile)
14+@@ -1029,7 +1029,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile)
1515
1616 /* open up gcm-viewer as a info pane */
1717 argv = g_ptr_array_new_with_free_func (g_free);
18−- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-viewer", NULL));
18+- g_ptr_array_add (argv, g_strdup ("gcm-viewer"));
1919+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL));
2020 g_ptr_array_add (argv, g_strdup ("--profile"));
2121 g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
2222 g_ptr_array_add (argv, g_strdup ("--parent-window"));
23−@@ -1288,15 +1288,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device)
23+@@ -1275,15 +1275,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device)
2424 static void
2525 gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device)
2626 {
@@ -38,12 +38,12 @@ index 49ca35220..adefb87b9 100644
3838 else
3939 gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE);
4040diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
41−index 96b25140c..1ad704d4a 100644
41+index a2376f8a4..98769e08f 100644
4242--- a/panels/datetime/tz.h
4343+++ b/panels/datetime/tz.h
4444@@ -27,11 +27,7 @@
4545
46− #include <glib.h>
46+ G_BEGIN_DECLS
4747
4848-#ifndef __sun
4949-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
@@ -55,25 +55,42 @@ index 96b25140c..1ad704d4a 100644
5555 typedef struct _TzDB TzDB;
5656 typedef struct _TzLocation TzLocation;
5757diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
58−index 4541986db..da7826bfe 100644
58+index bd0e07762..0e71351f8 100644
5959--- a/panels/info-overview/cc-info-overview-panel.c
6060+++ b/panels/info-overview/cc-info-overview-panel.c
61−@@ -169,7 +169,7 @@ load_gnome_version (char **version,
61+@@ -172,7 +172,7 @@ load_gnome_version (char **version,
6262 gsize length;
6363 g_autoptr(VersionData) data = NULL;
64−
64+
6565- if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml",
6666+ if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml",
6767 &contents,
6868 &length,
6969 &error))
70+diff --git a/panels/keyboard/cc-input-list-box.c b/panels/keyboard/cc-input-list-box.c
71+index 6c2cb5614..8f57159cc 100644
72+--- a/panels/keyboard/cc-input-list-box.c
73++++ b/panels/keyboard/cc-input-list-box.c
74+@@ -223,10 +223,10 @@ row_layout_cb (CcInputListBox *self,
75+ layout_variant = cc_input_source_get_layout_variant (source);
76+
77+ if (layout_variant && layout_variant[0])
78+- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"",
79++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"",
80+ layout, layout_variant);
81+ else
82+- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s",
83++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s",
84+ layout);
85+
86+ g_spawn_command_line_async (commandline, NULL);
7087diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
71−index 9390a3308..d30b4a68e 100644
88+index 505b8ee25..62e94009f 100644
7289--- a/panels/network/connection-editor/net-connection-editor.c
7390+++ b/panels/network/connection-editor/net-connection-editor.c
74−@@ -278,9 +278,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
91+@@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
7592 g_autoptr(GError) error = NULL;
76−
93+
7794 if (self->is_new_connection) {
7895- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type);
7996+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type);
@@ -84,19 +101,20 @@ index 9390a3308..d30b4a68e 100644
84101 }
85102
86103diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c
104+index 74dfb0e9a..5f53d1a20 100644
87105--- a/panels/network/net-device-bluetooth.c
88106+++ b/panels/network/net-device-bluetooth.c
89107@@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self)
90108 update_off_switch_from_device_state (self->device_off_switch, state, self);
91−
109+
92110 /* set up the Options button */
93111- path = g_find_program_in_path ("nm-connection-editor");
94112+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
95113 gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL);
96114 }
97−
115+
98116@@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self)
99−
117+
100118 connection = net_device_get_find_connection (self->client, self->device);
101119 uuid = nm_connection_get_uuid (connection);
102120- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
@@ -105,19 +123,20 @@ diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-b
105123 if (!g_spawn_command_line_async (cmdline, &error))
106124 g_warning ("Failed to launch nm-connection-editor: %s", error->message);
107125@@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self)
108−
126+
109127 gtk_widget_init_template (GTK_WIDGET (self));
110−
128+
111129- path = g_find_program_in_path ("nm-connection-editor");
112130+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
113131 gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL);
114132 }
115−
133+
116134diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
135+index 34eb86241..50d0a2bed 100644
117136--- a/panels/network/net-device-mobile.c
118137+++ b/panels/network/net-device-mobile.c
119−@@ -484,7 +484,7 @@ options_button_clicked_cb (NetDeviceMobile *self)
120−
138+@@ -508,7 +508,7 @@ options_button_clicked_cb (NetDeviceMobile *self)
139+
121140 connection = net_device_get_find_connection (self->client, self->device);
122141 uuid = nm_connection_get_uuid (connection);
123142- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
@@ -125,21 +144,21 @@ diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobi
125144 g_debug ("Launching '%s'\n", cmdline);
126145 if (!g_spawn_command_line_async (cmdline, &error))
127146 g_warning ("Failed to launch nm-connection-editor: %s", error->message);
128−@@ -776,7 +776,7 @@ net_device_mobile_init (NetDeviceMobile *self)
129−
147+@@ -797,7 +797,7 @@ net_device_mobile_init (NetDeviceMobile *self)
148+
130149 self->cancellable = g_cancellable_new ();
131−
150+
132151- path = g_find_program_in_path ("nm-connection-editor");
133152+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
134153 gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL);
135154 }
136−
155+
137156diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
138−index f53ba217e..d24bcaeb9 100644
157+index a31a606e3..ed5133d29 100644
139158--- a/panels/printers/pp-host.c
140159+++ b/panels/printers/pp-host.c
141160@@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task,
142− devices = g_new0 (PpDevicesList, 1);
161+ devices = g_ptr_array_new_with_free_func (g_object_unref);
143162
144163 argv = g_new0 (gchar *, 3);
145164- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
@@ -147,25 +166,8 @@ index f53ba217e..d24bcaeb9 100644
147166 argv[1] = g_strdup (priv->hostname);
148167
149168 /* Use SNMP to get printer's informations */
150−diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
151−index 35859526d..21486c917 100644
152−--- a/panels/region/cc-region-panel.c
153−+++ b/panels/region/cc-region-panel.c
154−@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self,
155− layout_variant = cc_input_source_get_layout_variant (source);
156−
157− if (layout_variant && layout_variant[0])
158−- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"",
159−+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"",
160− layout, layout_variant);
161− else
162−- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s",
163−+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s",
164− layout);
165−
166− g_spawn_command_line_async (commandline, NULL);
167169diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
168−index 00239ce0f..617c98870 100644
170+index 86f53d4fc..0b052856f 100644
169171--- a/panels/user-accounts/run-passwd.c
170172+++ b/panels/user-accounts/run-passwd.c
171173@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix+61−18
@@ -1,29 +1,40 @@
1−{ lib, stdenv, fetchurl, substituteAll, pkg-config, libxslt, ninja, gnome3, gtk3, glib
2−, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland
3−, libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, substituteAll
5+, pkg-config
6+, libxslt
7+, ninja
8+, gnome3
9+, gtk3
10+, glib
11+, gettext
12+, libxml2
13+, xkeyboard_config
14+, libxkbcommon
15+, isocodes
16+, meson
17+, wayland
18+, libseccomp
19+, systemd
20+, bubblewrap
21+, gobject-introspection
22+, gtk-doc
23+, docbook-xsl-nons
24+, gsettings-desktop-schemas
25+}:
426
527stdenv.mkDerivation rec {
628 pname = "gnome-desktop";
7− version = "3.38.4";
29+ version = "40.1";
830
931 outputs = [ "out" "dev" "devdoc" ];
1032
1133 src = fetchurl {
12− url = "mirror://gnome/sources/gnome-desktop/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "sha256-P2A+pb/UdyLJLPybiFRGtGJg6gnIz7Y/a92f7+NC5Iw=";
34+ url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major version}/${pname}-${version}.tar.xz";
35+ sha256 = "sha256-igeJcwUhnFaZVJriBI9xVVFe+Xx85NZYXd2hXVhZ4c8=";
1436 };
1537
16− nativeBuildInputs = [
17− pkg-config meson ninja gettext libxslt libxml2 gobject-introspection
18− gtk-doc docbook_xsl glib
19− ];
20− buildInputs = [
21− bubblewrap xkeyboard_config isocodes wayland
22− gtk3 glib libseccomp systemd
23− ];
24−
25− propagatedBuildInputs = [ gsettings-desktop-schemas ];
26−
2738 patches = [
2839 (substituteAll {
2940 src = ./bubblewrap-paths.patch;
@@ -32,11 +43,42 @@ stdenv.mkDerivation rec {
3243 })
3344 ];
3445
46+ nativeBuildInputs = [
47+ pkg-config
48+ meson
49+ ninja
50+ gettext
51+ libxslt
52+ libxml2
53+ gobject-introspection
54+ gtk-doc
55+ docbook-xsl-nons
56+ glib
57+ ];
58+
59+ buildInputs = [
60+ bubblewrap
61+ xkeyboard_config
62+ libxkbcommon # for xkbregistry
63+ isocodes
64+ wayland
65+ gtk3
66+ glib
67+ libseccomp
68+ systemd
69+ ];
70+
71+ propagatedBuildInputs = [
72+ gsettings-desktop-schemas
73+ ];
74+
3575 mesonFlags = [
3676 "-Dgtk_doc=true"
3777 "-Ddesktop_docs=false"
3878 ];
3979
80+ separateDebugInfo = stdenv.isLinux;
81+
4082 passthru = {
4183 updateScript = gnome3.updateScript {
4284 packageName = "gnome-desktop";
@@ -46,7 +88,8 @@ stdenv.mkDerivation rec {
4688
4789 meta = with lib; {
4890 description = "Library with common API for various GNOME modules";
49− license = with licenses; [ gpl2 lgpl2 ];
91+ homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop";
92+ license = with licenses; [ gpl2Plus lgpl2Plus ];
5093 platforms = platforms.linux;
5194 maintainers = teams.gnome.members;
5295 };
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix+4−12
@@ -1,24 +1,16 @@
1−{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt
1+{ lib, stdenv, fetchurl, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt
22, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43
33, gnome3, gtk3, glib, gsettings-desktop-schemas }:
44
55stdenv.mkDerivation rec {
66 pname = "gnome-dictionary";
7− version = "3.26.1";
7+ version = "40.0";
88
99 src = fetchurl {
10− url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300";
10+ url = "mirror://gnome/sources/gnome-dictionary/${lib.versions.major version}/${pname}-${version}.tar.xz";
11+ sha256 = "1d8dhcfys788vv27v34i3s3x3jdvdi2kqn2a5p8c937a9hm0qr9f";
1212 };
1313
14− patches = [
15− # fix AppStream validation
16− (fetchpatch {
17− url = "https://gitlab.gnome.org/GNOME/gnome-dictionary/commit/1c94d612030ef87c6e26a01a490470b71c39e341.patch";
18− sha256 = "0cbswmhs9mks3gsc0iy4wnidsa8sfzzf4s1kgvb80qwffgxz5m8b";
19− })
20− ];
21−
2214 doCheck = true;
2315
2416 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix+54−14
@@ -1,26 +1,66 @@
1−{ lib, stdenv, gettext, fetchurl, pkg-config, udisks2, libsecret, libdvdread
2−, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify
3−, itstool, gnome3, libxml2, gsettings-desktop-schemas
4−, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality, systemd }:
1+{ lib
2+, stdenv
3+, gettext
4+, fetchurl
5+, pkg-config
6+, udisks2
7+, libhandy
8+, libsecret
9+, libdvdread
10+, meson
11+, ninja
12+, gtk3
13+, glib
14+, wrapGAppsHook
15+, python3
16+, libnotify
17+, itstool
18+, gnome3
19+, libxml2
20+, gsettings-desktop-schemas
21+, libcanberra-gtk3
22+, libxslt
23+, docbook-xsl-nons
24+, libpwquality
25+, systemd
26+}:
527
628stdenv.mkDerivation rec {
729 pname = "gnome-disk-utility";
8− version = "3.38.2";
30+ version = "40.1";
931
1032 src = fetchurl {
11− url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "sha256-EL7d5UlL6zTjoiDW8w2TIMiCUv7rhCa9mM760YNteOk=";
33+ url = "mirror://gnome/sources/gnome-disk-utility/${lib.versions.major version}/${pname}-${version}.tar.xz";
34+ sha256 = "sha256-KkuZrBHKIzlLKMVYS56WKE6MWk2mXPBiB95U9Csf8UE=";
1335 };
1436
1537 nativeBuildInputs = [
16− meson ninja pkg-config gettext itstool libxslt docbook_xsl
17− wrapGAppsHook python3 libxml2
38+ meson
39+ ninja
40+ pkg-config
41+ gettext
42+ itstool
43+ libxslt
44+ docbook-xsl-nons
45+ wrapGAppsHook
46+ python3
47+ libxml2
1848 ];
1949
2050 buildInputs = [
21− gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
22− udisks2 gnome3.adwaita-icon-theme systemd
23− gnome3.gnome-settings-daemon gsettings-desktop-schemas
51+ gtk3
52+ glib
53+ libhandy
54+ libsecret
55+ libpwquality
56+ libnotify
57+ libdvdread
58+ libcanberra-gtk3
59+ udisks2
60+ gnome3.adwaita-icon-theme
61+ systemd
62+ gnome3.gnome-settings-daemon
63+ gsettings-desktop-schemas
2464 ];
2565
2666 postPatch = ''
@@ -36,10 +76,10 @@ stdenv.mkDerivation rec {
3676 };
3777
3878 meta = with lib; {
39− homepage = "https://en.wikipedia.org/wiki/GNOME_Disks";
79+ homepage = "https://wiki.gnome.org/Apps/Disks";
4080 description = "A udisks graphical front-end";
4181 maintainers = teams.gnome.members;
42− license = licenses.gpl2;
82+ license = licenses.gpl2Plus;
4383 platforms = platforms.linux;
4484 };
4585}
pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix+5−5
@@ -1,20 +1,20 @@
11{ lib, stdenv, meson, ninja, gettext, fetchurl
2−, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme
2+, pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme, libhandy
33, wrapGAppsHook, gnome3, harfbuzz }:
44
55stdenv.mkDerivation rec {
66 pname = "gnome-font-viewer";
7− version = "3.34.0";
7+ version = "40.0";
88
99 src = fetchurl {
10− url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "12xrsqwmvid7hksiw4zhj4jd1qwxn8w0czskbq4yqfprwn1havxa";
10+ url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/${pname}-${version}.tar.xz";
11+ sha256 = "0hpyi0sz3gcqqs9lkwyk8b6hr39m3n27432x98kxr436jj37dk6j";
1212 };
1313
1414 doCheck = true;
1515
1616 nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook libxml2 ];
17− buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz ];
17+ buildInputs = [ gtk3 glib gnome-desktop adwaita-icon-theme harfbuzz libhandy ];
1818
1919 # Do not run meson-postinstall.sh
2020 preConfigure = "sed -i '2,$ d' meson-postinstall.sh";
pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch+1−20
@@ -5,29 +5,10 @@ Date: Sun, 20 Sep 2020 14:46:59 -0400
55Subject: [PATCH] fix paths
66
77---
8− data/gnome-welcome-tour | 4 ++--
98 gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 6 +++---
109 gnome-initial-setup/pages/timezone/tz.h | 4 ++--
11− 3 files changed, 7 insertions(+), 7 deletions(-)
10+ 3 files changed, 5 insertions(+), 5 deletions(-)
1211
13−diff --git a/data/gnome-welcome-tour b/data/gnome-welcome-tour
14−index 51c9b59..68ab0c4 100755
15−--- a/data/gnome-welcome-tour
16−+++ b/data/gnome-welcome-tour
17−@@ -3,11 +3,11 @@
18− cfgdir=${XDG_CONFIG_DIR:-$HOME/.config}
19−
20− # Don't do anything if gnome-tour isn't installed
21−-gnome_tour_path=$(which gnome-tour 2>/dev/null)
22−+gnome_tour_path="@gnome_tour@"
23− if test -z "${gnome_tour_path}"; then
24− rm -f $cfgdir/run-welcome-tour
25− exit
26− fi
27−
28−-gnome-tour
29−+@gnome_tour@
30− rm -f $cfgdir/run-welcome-tour
3112diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
3213index 196abf6..613d0e5 100644
3314--- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix+10−14
@@ -14,7 +14,6 @@
1414, geocode-glib
1515, glib
1616, gnome-desktop
17−, gnome-getting-started-docs
1817, gnome-online-accounts
1918, gtk3
2019, libgweather
@@ -32,18 +31,24 @@
3231, tzdata
3332, libgnomekbd
3433, gsettings-desktop-schemas
35−, gnome-tour
3634}:
3735
3836stdenv.mkDerivation rec {
3937 pname = "gnome-initial-setup";
40− version = "3.38.4";
38+ version = "40.1";
4139
4240 src = fetchurl {
43− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
44− sha256 = "001jdzsvc541qracn68r609pr5qwymrh85xrqmvzzc1dbg5w3mlg";
41+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
42+ sha256 = "10zf87n6c947k9rkk2rqc9cbfwcvq23axq3rf7x1an7npv3414gi";
4543 };
4644
45+ patches = [
46+ (substituteAll {
47+ src = ./0001-fix-paths.patch;
48+ inherit tzdata libgnomekbd;
49+ })
50+ ];
51+
4752 nativeBuildInputs = [
4853 gettext
4954 meson
@@ -61,7 +66,6 @@ stdenv.mkDerivation rec {
6166 geocode-glib
6267 glib
6368 gnome-desktop
64− gnome-getting-started-docs
6569 gnome-online-accounts
6670 gsettings-desktop-schemas
6771 gtk3
@@ -78,14 +82,6 @@ stdenv.mkDerivation rec {
7882 webkitgtk
7983 ];
8084
81− patches = [
82− (substituteAll {
83− src = ./0001-fix-paths.patch;
84− inherit tzdata libgnomekbd;
85− gnome_tour = "${gnome-tour}/bin/gnome-tour";
86− })
87− ];
88−
8985 mesonFlags = [
9086 "-Dcheese=disabled"
9187 "-Dibus=disabled"
pkgs/desktops/gnome-3/core/gnome-keyring/default.nix+46−25
@@ -1,51 +1,72 @@
1−{ lib, stdenv, fetchurl, fetchpatch, pkg-config, dbus, libgcrypt, pam, python2, glib, libxslt
2−, gettext, gcr, libcap_ng, libselinux, p11-kit, openssh, wrapGAppsHook
3−, docbook_xsl, docbook_xml_dtd_43, gnome3 }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, pkg-config
5+, dbus
6+, libgcrypt
7+, pam
8+, python2
9+, glib
10+, libxslt
11+, gettext
12+, gcr
13+, libcap_ng
14+, libselinux
15+, p11-kit
16+, openssh
17+, wrapGAppsHook
18+, docbook-xsl-nons
19+, docbook_xml_dtd_43
20+, gnome3
21+}:
422
523stdenv.mkDerivation rec {
624 pname = "gnome-keyring";
7− version = "3.36.0";
25+ version = "40.0";
26+
27+ outputs = [ "out" "dev" ];
828
929 src = fetchurl {
10− url = "mirror://gnome/sources/gnome-keyring/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52";
30+ url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz";
31+ sha256 = "0cdrlcw814zayhvlaxqs1sm9bqlfijlp22dzzd0g5zg2isq4vlm3";
1232 };
1333
14− patches = [
15− # version 3.36.0 is incompatible with libncap_ng >= 0.8.1. remove patch after update.
16− (fetchpatch {
17− url = "https://gitlab.gnome.org/GNOME/gnome-keyring/-/commit/ebc7bc9efacc17049e54da8d96a4a29943621113.diff";
18− sha256 = "07bx7zmdswqsa3dj37m729g35n1prhylkw7ya8a7h64i10la12cs";
19− })
34+ nativeBuildInputs = [
35+ pkg-config
36+ gettext
37+ libxslt
38+ docbook-xsl-nons
39+ docbook_xml_dtd_43
40+ wrapGAppsHook
2041 ];
2142
22− outputs = [ "out" "dev" ];
23−
2443 buildInputs = [
25− glib libgcrypt pam openssh libcap_ng libselinux
26− gcr p11-kit
44+ glib
45+ libgcrypt
46+ pam
47+ openssh
48+ libcap_ng
49+ libselinux
50+ gcr
51+ p11-kit
2752 ];
2853
29− nativeBuildInputs = [
30− pkg-config gettext libxslt docbook_xsl docbook_xml_dtd_43 wrapGAppsHook
31− ];
54+ # In 3.20.1, tests do not support Python 3
55+ checkInputs = [ dbus python2 ];
3256
3357 configureFlags = [
3458 "--with-pkcs11-config=${placeholder "out"}/etc/pkcs11/" # installation directories
3559 "--with-pkcs11-modules=${placeholder "out"}/lib/pkcs11/"
3660 ];
3761
38− postPatch = ''
39− patchShebangs build
40− '';
41−
4262 # Tends to fail non-deterministically.
4363 # - https://github.com/NixOS/nixpkgs/issues/55293
4464 # - https://github.com/NixOS/nixpkgs/issues/51121
4565 doCheck = false;
4666
47− # In 3.20.1, tests do not support Python 3
48− checkInputs = [ dbus python2 ];
67+ postPatch = ''
68+ patchShebangs build
69+ '';
4970
5071 checkPhase = ''
5172 export HOME=$(mktemp -d)
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix+3−3
@@ -4,13 +4,13 @@
44
55let
66 pname = "gnome-screenshot";
7− version = "3.38.0";
7+ version = "40.0";
88in stdenv.mkDerivation rec {
99 name = "${pname}-${version}";
1010
1111 src = fetchurl {
12− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
13− sha256 = "1h4zsaybjrlkfcrvriyybg4gfr7v9d1ndh2p516k94ad2gfx6mp5";
12+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${name}.tar.xz";
13+ sha256 = "1qm544ymwibk31s30k47vnn79xg30m18r7l4di0c57g375dak31n";
1414 };
1515
1616 doCheck = true;
pkgs/desktops/gnome-3/core/gnome-session/ctl.nix+5−4
@@ -1,4 +1,5 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchFromGitHub
34, meson
45, ninja
@@ -10,13 +11,13 @@
1011
1112stdenv.mkDerivation rec {
1213 pname = "gnome-session-ctl";
13− version = "3.38.0";
14+ version = "40.0";
1415
1516 src = fetchFromGitHub {
1617 owner = "nix-community";
1718 repo = pname;
18− rev = "c20907fea27fa96568b8375a6756c40d0bfb9e40"; # main
19− hash = "sha256-y9/yOH6N8wf93+gPqnqzRzV/lPXYD0M6v7dsLFF8lWo=";
19+ rev = version;
20+ hash = "sha256-gvBmLx8Qoj1vPsOwaZsd9+pTDvU5D7uUts7ZT1pXwNo=";
2021 };
2122
2223 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/gnome-session/default.nix+4−11
@@ -1,17 +1,16 @@
11{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas
22, gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3
3−, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl
4−, fetchpatch }:
3+, libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }:
54
65stdenv.mkDerivation rec {
76 pname = "gnome-session";
8− version = "3.38.0";
7+ version = "40.1.1";
98
109 outputs = ["out" "sessions"];
1110
1211 src = fetchurl {
13− url = "mirror://gnome/sources/gnome-session/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
14− sha256 = "0rrxjk3vbqy3cdgnl7rw71dvcyrvhwq3m6s53dnkyjxsrnr0xk3v";
12+ url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz";
13+ sha256 = "10nzyhmgkrzk6i70kj7690na0hmsv6qy5bmr10akxq9jxqlphy4w";
1514 };
1615
1716 patches = [
@@ -22,12 +21,6 @@ stdenv.mkDerivation rec {
2221 grep = "${gnugrep}/bin/grep";
2322 bash = "${bash}/bin/bash";
2423 })
25− # Fixes 2 minute delay at poweroff.
26− # https://gitlab.gnome.org/GNOME/gnome-session/issues/74
27− (fetchpatch {
28− url = "https://gitlab.gnome.org/GNOME/gnome-session/-/commit/9de6e40f12e8878f524f8d429d85724c156a0517.diff";
29− sha256 = "19vrjdf7d6dfl7sqxvbc5h5lcgk1krgzg5rkssrdzd1h4ma6y8fz";
30− })
3124 ];
3225
3326 mesonFlags = [ "-Dsystemd=true" "-Dsystemd_session=default" ];
pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix+3−3
@@ -42,11 +42,11 @@
4242
4343stdenv.mkDerivation rec {
4444 pname = "gnome-settings-daemon";
45− version = "3.38.1";
45+ version = "40.0.1";
4646
4747 src = fetchurl {
48− url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
49− sha256 = "0r010wzw3dj87mapzvq15zv93i86wg0x0rpii3x2wapq3bcj30g2";
48+ url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
49+ sha256 = "08bv32hvsmd8izw0llvldg0c2d71srch4hi8j94jwgm5d4dsrprp";
5050 };
5151
5252 patches = [
pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix+12−4
@@ -1,13 +1,13 @@
1−{ lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, spidermonkey_68, glib
1+{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, pkg-config, spidermonkey_68, glib
22, gnome3, gnome-menus, substituteAll }:
33
44stdenv.mkDerivation rec {
55 pname = "gnome-shell-extensions";
6− version = "3.38.2";
6+ version = "40.0";
77
88 src = fetchurl {
9− url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "0hzn975v49rv3nsqp8m0mzv8gcm7nyvn54gj3zsml8ahlxwl592p";
9+ url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major version}/${pname}-${version}.tar.xz";
10+ sha256 = "15hak4prx2nx1svfii39clxy1lll8crdf7p91if85jcsh6r8ab8p";
1111 };
1212
1313 passthru = {
@@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
2222 src = ./fix_gmenu.patch;
2323 gmenu_path = "${gnome-menus}/lib/girepository-1.0";
2424 })
25+
26+ # Do not show welcome dialog in gnome-classic.
27+ # Needed for gnome-shell 40.1.
28+ # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/169
29+ (fetchpatch {
30+ url = "https://gitlab.gnome.org/GNOME/gnome-shell-extensions/commit/3e8bbb07ea7109c44d5ac7998f473779e742d041.patch";
31+ sha256 = "jSmPwSBgRBfPPP9mGVjw1mSWumIXQqtA6tSqHr3U+3w=";
32+ })
2533 ];
2634
2735 doCheck = true;
pkgs/desktops/gnome-3/core/gnome-shell/default.nix+22−10
@@ -1,5 +1,6 @@
11{ fetchurl
22, fetchpatch
3+, fetchgit
34, substituteAll
45, lib, stdenv
56, meson
@@ -22,8 +23,7 @@
2223, librsvg
2324, geoclue2
2425, perl
25−, docbook_xml_dtd_42
26−, docbook_xml_dtd_43
26+, docbook_xml_dtd_45
2727, desktop-file-utils
2828, libpulseaudio
2929, libical
@@ -46,6 +46,7 @@
4646, mutter
4747, evolution-data-server
4848, gtk3
49+, gtk4
4950, sassc
5051, systemd
5152, pipewire
@@ -66,14 +67,20 @@ let
6667in
6768stdenv.mkDerivation rec {
6869 pname = "gnome-shell";
69− version = "3.38.3";
70+ version = "40.0-unstable-2021-05-01";
7071
7172 outputs = [ "out" "devdoc" ];
7273
73− src = fetchurl {
74− url = "mirror://gnome/sources/gnome-shell/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
75− sha256 = "sha256-U0W0GMsSqXKVXOXM6u1mYkgAJzNrXFHa6lcwV1tiHO0=";
74+ src = fetchgit {
75+ url = "https://gitlab.gnome.org/GNOME/gnome-shell.git";
76+ rev = "a8a79c03330427808e776c344f7ebc42782a1b5a";
77+ sha256 = "ivHV0SRpnBqsdC7fu1Xhtd/BA55O0UdbUyDLy5KHNYs=";
78+ fetchSubmodules = true;
7679 };
80+ # src = fetchurl {
81+ # url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
82+ # sha256 = "sha256-vOcfQC36qcXiab9lv0iiI0PYlubPmiw0ZpOS1/v2hHg=";
83+ # };
7784
7885 patches = [
7986 # Hardcode paths to various dependencies so that they can be found at runtime.
@@ -97,6 +104,12 @@ stdenv.mkDerivation rec {
97104 revert = true;
98105 sha256 = "14h7ahlxgly0n3sskzq9dhxzbyb04fn80pv74vz1526396676dzl";
99106 })
107+
108+ # Work around failing fingerprint auth
109+ (fetchpatch {
110+ url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch";
111+ sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw=";
112+ })
100113 ];
101114
102115 nativeBuildInputs = [
@@ -105,9 +118,7 @@ stdenv.mkDerivation rec {
105118 pkg-config
106119 gettext
107120 docbook-xsl-nons
108− # Switch to 4.5 in the 40.
109− docbook_xml_dtd_42
110− docbook_xml_dtd_43
121+ docbook_xml_dtd_45
111122 gtk-doc
112123 perl
113124 wrapGAppsHook
@@ -137,6 +148,7 @@ stdenv.mkDerivation rec {
137148 evolution-data-server
138149 libical
139150 gtk3
151+ gtk4
140152 gdm
141153 geoclue2
142154 adwaita-icon-theme
@@ -189,7 +201,7 @@ stdenv.mkDerivation rec {
189201
190202 postFixup = ''
191203 # The services need typelibs.
192− for svc in org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do
204+ for svc in org.gnome.ScreenSaver org.gnome.Shell.Extensions org.gnome.Shell.Notifications org.gnome.Shell.Screencast; do
193205 wrapGApp $out/share/gnome-shell/$svc
194206 done
195207 '';
pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch+1−1
@@ -3,7 +3,7 @@
33@@ -13,7 +13,7 @@ shew_sources = [
44 libshew = library(full_name,
55 sources: shew_sources,
6− dependencies: [gtk_dep],
6+ dependencies: [gtk_dep, x11_dep],
77- install_dir: pkglibdir,
88+ install_dir: get_option('prefix') / pkglibdir,
99 install: true,
pkgs/desktops/gnome-3/core/gnome-software/default.nix+7−6
@@ -11,8 +11,9 @@
1111, packagekit
1212, ostree
1313, glib
14−, appstream-glib
14+, appstream
1515, libsoup
16+, libhandy
1617, polkit
1718, isocodes
1819, gspell
@@ -42,11 +43,11 @@ in
4243
4344stdenv.mkDerivation rec {
4445 pname = "gnome-software";
45− version = "3.38.0";
46+ version = "40.1";
4647
4748 src = fetchurl {
48− url = "mirror://gnome/sources/gnome-software/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
49− sha256 = "0rjm486vgn6gi9mv1rqdcvr9cilmw6in4r6djqkxbxqll89cp2l7";
49+ url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
50+ sha256 = "16q2902swxsjdxb1nj335sv1bb76rvq4w6dn4yszkwf3s0fd86in";
5051 };
5152
5253 patches = [
@@ -76,8 +77,9 @@ stdenv.mkDerivation rec {
7677 gtk3
7778 glib
7879 packagekit
79− appstream-glib
80+ appstream
8081 libsoup
82+ libhandy
8183 gsettings-desktop-schemas
8284 gnome-desktop
8385 gspell
@@ -94,7 +96,6 @@ stdenv.mkDerivation rec {
9496 ];
9597
9698 mesonFlags = [
97− "-Dubuntu_reviews=false"
9899 "-Dgudev=false"
99100 # FIXME: package malcontent parental controls
100101 "-Dmalcontent=false"
pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix+48−11
@@ -1,26 +1,63 @@
1−{ lib, stdenv, gettext, fetchurl, pkg-config, gtkmm3, libxml2
2−, bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3
3−, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }:
1+{ lib
2+, stdenv
3+, gettext
4+, fetchurl
5+, pkg-config
6+, gtkmm3
7+, libxml2
8+, bash
9+, gtk3
10+, libhandy
11+, glib
12+, wrapGAppsHook
13+, meson
14+, ninja
15+, python3
16+, gsettings-desktop-schemas
17+, itstool
18+, gnome3
19+, librsvg
20+, gdk-pixbuf
21+, libgtop
22+, systemd
23+}:
424
525stdenv.mkDerivation rec {
626 pname = "gnome-system-monitor";
7− version = "3.38.0";
27+ version = "40.1";
828
929 src = fetchurl {
10− url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "1x5gd30g87im7fnqj63njlac69zywfd1r0vgsxkjag2hsns7mgvk";
30+ url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major version}/${pname}-${version}.tar.xz";
31+ sha256 = "06hxd4igxas2kyind5jwfq5qbfkknykpdfy2sy3anylhcx1hzczx";
1232 };
1333
14− doCheck = true;
15−
1634 nativeBuildInputs = [
17− pkg-config gettext itstool wrapGAppsHook meson ninja python3
35+ pkg-config
36+ gettext
37+ itstool
38+ wrapGAppsHook
39+ meson
40+ ninja
41+ python3
1842 ];
43+
1944 buildInputs = [
20− bash gtk3 glib libxml2 gtkmm3 libgtop gdk-pixbuf gnome3.adwaita-icon-theme librsvg
21− gsettings-desktop-schemas systemd
45+ bash
46+ gtk3
47+ libhandy
48+ glib
49+ libxml2
50+ gtkmm3
51+ libgtop
52+ gdk-pixbuf
53+ gnome3.adwaita-icon-theme
54+ librsvg
55+ gsettings-desktop-schemas
56+ systemd
2257 ];
2358
59+ doCheck = true;
60+
2461 postPatch = ''
2562 chmod +x meson_post_install.py # patchShebangs requires executable file
2663 patchShebangs meson_post_install.py
pkgs/desktops/gnome-3/core/gnome-terminal/default.nix+2−2
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "gnome-terminal";
8− version = "3.38.3";
8+ version = "3.40.1";
99
1010 src = fetchurl {
1111 url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "EaWw1jXxX9znUINRpRD79OkqpTMVKlD/DHhF4xAuR2Q=";
12+ sha256 = "1r6qd6w18gk83w32y6bvn4hg2hd7qvngak4ymwpgndyp41rwqw07";
1313 };
1414
1515 buildInputs = [
pkgs/desktops/gnome-3/core/gnome-tour/default.nix+3−3
@@ -22,11 +22,11 @@
2222
2323stdenv.mkDerivation rec {
2424 pname = "gnome-tour";
25− version = "3.38.0";
25+ version = "40.0";
2626
2727 src = fetchurl {
28− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
29− hash = "sha256-hV/C/Lyz6e9zhe3FRw4Sox5gMqThDP57wVCTgcekjng=";
28+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
29+ hash = "sha256-cGMiOGmgdHJ0FL7H23ONhQYhbuhMz8O8p9rFLkmMG/k=";
3030 };
3131
3232 cargoVendorDir = "vendor";
pkgs/desktops/gnome-3/core/gvc-with-ucm-prePatch.nixdeleted−17
@@ -1,17 +0,0 @@
1−{ fetchFromGitLab }:
2−
3−let
4− # We need a gvc different then that which is shipped in the source tarball of
5− # whatever package that imports this file
6− gvc-src-with-ucm = fetchFromGitLab {
7− domain = "gitlab.gnome.org";
8− owner = "GNOME";
9− repo = "libgnome-volume-control";
10− rev = "7a621180b46421e356b33972e3446775a504139c";
11− sha256 = "07rkgh9f7qcmlpy6jqh944axzh3z38f47g48ii842f2i3a1mrbw9";
12− };
13−in
14−''
15− rm -r ./subprojects/gvc
16− cp -r ${gvc-src-with-ucm} ./subprojects/gvc
17−''
pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix−7
@@ -17,13 +17,6 @@ stdenv.mkDerivation rec {
1717 propagatedBuildInputs = [ glib gobject-introspection dbus libgcrypt ];
1818 nativeBuildInputs = [ pkg-config intltool ];
1919
20− passthru = {
21− updateScript = gnome3.updateScript {
22− packageName = pname;
23− attrPath = "gnome3.${pname}";
24− };
25− };
26−
2720 meta = {
2821 description = "Framework for managing passwords and other secrets";
2922 homepage = "https://wiki.gnome.org/Projects/GnomeKeyring";
pkgs/desktops/gnome-3/core/mutter/default.nix+12−5
@@ -45,24 +45,31 @@
4545
4646let self = stdenv.mkDerivation rec {
4747 pname = "mutter";
48− version = "3.38.3";
48+ version = "40.0";
4949
5050 outputs = [ "out" "dev" "man" ];
5151
5252 src = fetchurl {
53− url = "mirror://gnome/sources/mutter/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
54− sha256 = "sha256-sjIec9Hj/i6Q5jAfQrugf02UvGR1aivxPXWunW+qIB8=";
53+ url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
54+ sha256 = "sha256-enGzEuWmZ8U3SJUYilBqP2tnF2i8s2K2jv3FYnc9GY4=";
5555 };
5656
5757 patches = [
5858 # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking
5959 # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381
60− ./drop-inheritable.patch
60+ # ./drop-inheritable.patch
6161
6262 (substituteAll {
6363 src = ./fix-paths.patch;
6464 inherit zenity;
6565 })
66+
67+ # Fix non-deterministic build failure:
68+ # https://gitlab.gnome.org/GNOME/mutter/-/issues/1682
69+ (fetchpatch {
70+ url = "https://gitlab.gnome.org/GNOME/mutter/commit/91117bb052ed0d69c8ea4159c1df15c814d90627.patch";
71+ sha256 = "ek8hEoPP4S2TGOm6SGGOhUVIp4OT68nz0SQzZrceFUU=";
72+ })
6673 ];
6774
6875 mesonFlags = [
@@ -155,7 +162,7 @@ let self = stdenv.mkDerivation rec {
155162 meta = with lib; {
156163 description = "A window manager for GNOME";
157164 homepage = "https://gitlab.gnome.org/GNOME/mutter";
158− license = licenses.gpl2;
165+ license = licenses.gpl2Plus;
159166 maintainers = teams.gnome.members;
160167 platforms = platforms.linux;
161168 };
pkgs/desktops/gnome-3/core/nautilus/default.nix+7−3
@@ -9,6 +9,8 @@
99, python3
1010, wrapGAppsHook
1111, gtk3
12+, libhandy
13+, libportal
1214, gnome3
1315, gnome-autoar
1416, glib-networking
@@ -32,11 +34,11 @@
3234
3335stdenv.mkDerivation rec {
3436 pname = "nautilus";
35− version = "3.38.2";
37+ version = "40.1";
3638
3739 src = fetchurl {
38− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
39− sha256 = "19ln84d6s05h6cvx3c500bg5pvkz4k6p6ykmr2201rblq9afp76h";
40+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
41+ sha256 = "0cwxr7bfa19dvzra81s9wfshzv0zv7ycpfffn4amigd0fh0vkkwf";
4042 };
4143
4244 patches = [
@@ -71,6 +73,8 @@ stdenv.mkDerivation rec {
7173 gsettings-desktop-schemas
7274 gst_all_1.gst-plugins-base
7375 gtk3
76+ libhandy
77+ libportal
7478 libexif
7579 libnotify
7680 libseccomp
pkgs/desktops/gnome-3/core/rygel/default.nix+1
@@ -96,6 +96,7 @@ stdenv.mkDerivation rec {
9696 updateScript = gnome3.updateScript {
9797 packageName = pname;
9898 attrPath = "gnome3.${pname}";
99+ versionPolicy = "odd-unstable";
99100 };
100101 };
101102
pkgs/desktops/gnome-3/core/simple-scan/default.nix+5−3
@@ -14,6 +14,7 @@
1414, gtk3
1515, gusb
1616, packagekit
17+, libhandy
1718, libwebp
1819, libxml2
1920, sane-backends
@@ -24,11 +25,11 @@
2425
2526stdenv.mkDerivation rec {
2627 pname = "simple-scan";
27− version = "3.38.2";
28+ version = "40.0";
2829
2930 src = fetchurl {
30− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
31− sha256 = "sha256-qI2AcpaCiIZJzfzfqGkrCjSs3ladwICIjyea/DqcTQs=";
31+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
32+ sha256 = "sha256-E4EbsqhhnmOkP8Lva3E1ny1cQITG1cizqtYXJLIHUa8=";
3233 };
3334
3435 nativeBuildInputs = [
@@ -51,6 +52,7 @@ stdenv.mkDerivation rec {
5152 gnome3.adwaita-icon-theme
5253 gusb
5354 gtk3
55+ libhandy
5456 libwebp
5557 packagekit
5658 sane-backends
pkgs/desktops/gnome-3/core/sushi/default.nix+1−4
@@ -5,8 +5,6 @@
55, gettext
66, gobject-introspection
77, glib
8−, clutter-gtk
9−, clutter-gst
108, gnome3
119, gtksourceview4
1210, gjs
@@ -40,14 +38,13 @@ stdenv.mkDerivation rec {
4038 gobject-introspection
4139 wrapGAppsHook
4240 ];
41+
4342 buildInputs = [
4443 glib
4544 gtk3
4645 gnome3.evince
4746 icu
4847 harfbuzz
49− clutter-gtk
50− clutter-gst
5148 gjs
5249 gtksourceview4
5350 gdk-pixbuf
pkgs/desktops/gnome-3/core/yelp-xsl/default.nix+3−3
@@ -10,11 +10,11 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "yelp-xsl";
13− version = "3.38.3";
13+ version = "40.0";
1414
1515 src = fetchurl {
16− url = "mirror://gnome/sources/yelp-xsl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
17− sha256 = "sha256-GTtqvUaXt7Qh6Yw21NMTXaCw/bUapT5gLtNo3YTR/QM=";
16+ url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major version}/${pname}-${version}.tar.xz";
17+ sha256 = "sha256-Nh7NTTP8zbO7CKaH9g5cPpCdLp47Ai2ETgSYINDPYrA=";
1818 };
1919
2020 nativeBuildInputs = [
pkgs/desktops/gnome-3/core/yelp/default.nix+3−3
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "yelp";
8− version = "3.38.3";
8+ version = "40.0";
99
1010 src = fetchurl {
11− url = "mirror://gnome/sources/yelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "sha256-r9RqTQrrRrtCXFIAcdgY+LKzLmnnVqv9mXlodpphVJ0=";
11+ url = "mirror://gnome/sources/yelp/${lib.versions.major version}/${pname}-${version}.tar.xz";
12+ sha256 = "sha256-B3dfoGzSg2Xs2Cm7FqhaaCiXqyHYzONFlrvvXNRVquA=";
1313 };
1414
1515 nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ];
pkgs/desktops/gnome-3/default.nix+2−2
@@ -176,8 +176,6 @@ lib.makeScope pkgs.newScope (self: with self; {
176176
177177 gnome-documents = callPackage ./apps/gnome-documents { };
178178
179− gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { };
180−
181179 gnome-logs = callPackage ./apps/gnome-logs { };
182180
183181 gnome-maps = callPackage ./apps/gnome-maps { };
@@ -361,4 +359,6 @@ lib.makeScope pkgs.newScope (self: with self; {
361359 maintainers = lib.teams.gnome.members;
362360
363361 mutter328 = throw "Removed as Pantheon is upgraded to mutter334.";
362+
363+ gnome-getting-started-docs = throw "Removed in favour of gnome-tour.";
364364})
pkgs/desktops/gnome-3/devtools/devhelp/default.nix+3−3
@@ -20,11 +20,11 @@
2020
2121stdenv.mkDerivation rec {
2222 pname = "devhelp";
23− version = "3.38.1";
23+ version = "40.0";
2424
2525 src = fetchurl {
26− url = "mirror://gnome/sources/devhelp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
27− sha256 = "13sa25mmlc49kn520hdfbskma65y7smvwmyhfggj0n9s3fazba2d";
26+ url = "mirror://gnome/sources/devhelp/${lib.versions.major version}/${pname}-${version}.tar.xz";
27+ sha256 = "0zr64qp5c6jcc3x5hmfp7jhzpi96qwr6xplyfkmz4kjzvr9xidjd";
2828 };
2929
3030 nativeBuildInputs = [
pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix+3−3
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnome-devel-docs";
5− version = "3.38.2";
5+ version = "40.0";
66
77 src = fetchurl {
8− url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "1h6481hbz1c5p69r6h96hbgf560lhp1jibszscgw0s2yikdh6q8n";
8+ url = "mirror://gnome/sources/gnome-devel-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
9+ sha256 = "0zqp01ks8m3s6jn5xqd05rw4fwbvxy5qvcfg9g50b2ar2j7v1ar8";
1010 };
1111
1212 passthru = {
pkgs/desktops/gnome-3/extensions/gsconnect/default.nix+2−2
@@ -19,7 +19,7 @@
1919
2020stdenv.mkDerivation rec {
2121 pname = "gnome-shell-gsconnect";
22− version = "44";
22+ version = "46";
2323
2424 outputs = [ "out" "installedTests" ];
2525
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
2727 owner = "andyholmes";
2828 repo = "gnome-shell-extension-gsconnect";
2929 rev = "v${version}";
30− sha256 = "C+8mhK4UOs2iZplDyY45bCX0mMGgwVV/ZfaPpYUlWxA=";
30+ sha256 = "161379kipr6z6gbhchb5b17djrkg5fbvblyyabzkc2gv05r3h6fw";
3131 };
3232
3333 patches = [
pkgs/desktops/gnome-3/extensions/hot-edge/default.nixnew file+33
@@ -0,0 +1,33 @@
1+{ lib
2+, stdenv
3+, fetchFromGitHub
4+}:
5+
6+stdenv.mkDerivation rec {
7+ pname = "gnome-shell-extension-hot-edge";
8+ version = "jdoda";
9+
10+ src = fetchFromGitHub {
11+ owner = "jdoda";
12+ repo = "hotedge";
13+ rev = "bb7f651becea5287241caf7cda246a68ab07dac8";
14+ sha256 = "oeTs0kRan6b5relxzhK1IKbV0Yv2d5YdvvUPJ3fM9ik=";
15+ };
16+
17+ dontBuild = true;
18+
19+ uuid = "hotedge@jonathan.jdoda.ca";
20+
21+ installPhase = ''
22+ runHook preInstall
23+ install -Dt $out/share/gnome-shell/extensions/${uuid} extension.js metadata.json stylesheet.css
24+ runHook postInstall
25+ '';
26+
27+ meta = with lib; {
28+ description = "Replace the top-left hot corner with a bottom hot edge";
29+ license = licenses.gpl2Plus;
30+ maintainers = with maintainers; [ jtojnar ];
31+ homepage = "https://github.com/jdoda/hotedge";
32+ };
33+}
pkgs/desktops/gnome-3/find-latest-version.py+27−12
@@ -3,14 +3,21 @@ import math
33import json
44import requests
55import sys
6+from libversion import Version
7+from typing import Optional
68
79
810def version_to_list(version):
911 return list(map(int, version.split(".")))
1012
1113
12−def odd_unstable(version_str, selected):
13− version = version_to_list(version_str)
14+def odd_unstable(version: Version, selected):
15+ try:
16+ version = version_to_list(version.value)
17+ except:
18+ # Failing to parse as a list of numbers likely means the version contains a string tag like “beta”, therefore it is not a stable release.
19+ return selected != "stable"
20+
1421 if len(version) < 2:
1522 return True
1623
@@ -23,28 +30,34 @@ def odd_unstable(version_str, selected):
2330 return True
2431
2532
26−def no_policy(version, selected):
33+def tagged(version: Version, selected):
34+ if selected == "stable":
35+ return not ("alpha" in version.value or "beta" in version.value or "rc" in version.value)
36+ else:
37+ return True
38+
39+
40+def no_policy(version: Version, selected):
2741 return True
2842
2943
3044version_policies = {
3145 "odd-unstable": odd_unstable,
46+ "tagged": tagged,
3247 "none": no_policy,
3348}
3449
3550
36−def make_version_policy(version_predicate, selected, upper_bound):
51+def make_version_policy(version_predicate, selected, upper_bound: Optional[Version]):
3752 if not upper_bound:
38− upper_bound = [math.inf, math.inf]
53+ return lambda version: version_predicate(version, selected)
3954 else:
40− upper_bound = version_to_list(upper_bound)
41−
42− return lambda version: version_predicate(version, selected) and version_to_list(version) < upper_bound
55+ return lambda version: version_predicate(version, selected) and version < upper_bound
4356
4457
4558parser = argparse.ArgumentParser(description="Find latest version for a GNOME package by crawling their release server.")
4659parser.add_argument("package-name", help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.")
47−parser.add_argument("version-policy", help="Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="odd-unstable")
60+parser.add_argument("version-policy", help="Policy determining which versions are considered stable. GNOME packages usually denote stability by alpha/beta/rc tag in the version. For older packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="tagged")
4861parser.add_argument("requested-release", help="Most of the time, we will want to update to stable version but sometimes it is useful to test.", choices=["stable", "unstable"], nargs="?", default="stable")
4962parser.add_argument("--upper-bound", dest="upper-bound", help="Only look for versions older than this one (useful for pinning dependencies).")
5063
@@ -55,6 +68,8 @@ if __name__ == "__main__":
5568 package_name = getattr(args, "package-name")
5669 requested_release = getattr(args, "requested-release")
5770 upper_bound = getattr(args, "upper-bound")
71+ if upper_bound:
72+ upper_bound = Version(upper_bound)
5873 version_predicate = version_policies[getattr(args, "version-policy")]
5974 version_policy = make_version_policy(version_predicate, requested_release, upper_bound)
6075
@@ -64,11 +79,11 @@ if __name__ == "__main__":
6479 print("Unknown format of cache.json file.", file=sys.stderr)
6580 sys.exit(1)
6681
67− versions = cache[2][package_name]
68− versions = sorted(filter(version_policy, versions), key=version_to_list)
82+ versions = map(Version, cache[2][package_name])
83+ versions = sorted(filter(version_policy, versions))
6984
7085 if len(versions) == 0:
7186 print("No versions matched.", file=sys.stderr)
7287 sys.exit(1)
7388
74− print(versions[-1])
89+ print(versions[-1].value)
pkgs/desktops/gnome-3/games/gnome-chess/default.nix+41−8
@@ -1,17 +1,50 @@
1−{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, wrapGAppsHook, gobject-introspection
2−, gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, meson
5+, ninja
6+, vala
7+, pkg-config
8+, wrapGAppsHook4
9+, gobject-introspection
10+, gettext
11+, itstool
12+, libxml2
13+, python3
14+, gnome3
15+, glib
16+, gtk4
17+, librsvg
18+}:
319
420stdenv.mkDerivation rec {
521 pname = "gnome-chess";
6− version = "3.38.1";
22+ version = "40.1";
723
824 src = fetchurl {
9− url = "mirror://gnome/sources/gnome-chess/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "1bpmi5p5vvjdq2rlm5x9k4gpci8jbrjvdxr1q62h5znzq0vz0w0l";
25+ url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz";
26+ sha256 = "132nc96z0bryyi9d5gljsbwsa71rl8wm5w57jbhpwiv4fyjhgybk";
1127 };
1228
13− nativeBuildInputs = [ meson ninja vala pkg-config gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ];
14− buildInputs = [ glib gtk3 librsvg gnome3.adwaita-icon-theme ];
29+ nativeBuildInputs = [
30+ meson
31+ ninja
32+ vala
33+ pkg-config
34+ gettext
35+ itstool
36+ libxml2
37+ python3
38+ wrapGAppsHook4
39+ gobject-introspection
40+ ];
41+
42+ buildInputs = [
43+ glib
44+ gtk4
45+ librsvg
46+ gnome3.adwaita-icon-theme
47+ ];
1548
1649 postPatch = ''
1750 chmod +x meson_post_install.py
@@ -29,7 +62,7 @@ stdenv.mkDerivation rec {
2962 homepage = "https://wiki.gnome.org/Apps/Chess";
3063 description = "Play the classic two-player boardgame of chess";
3164 maintainers = teams.gnome.members;
32− license = licenses.gpl2;
65+ license = licenses.gpl3Plus;
3366 platforms = platforms.linux;
3467 };
3568}
pkgs/desktops/gnome-3/games/gnome-klotski/default.nix+2−2
@@ -5,13 +5,13 @@
55
66let
77 pname = "gnome-klotski";
8− version = "3.38.1";
8+ version = "3.38.2";
99in stdenv.mkDerivation rec {
1010 name = "${pname}-${version}";
1111
1212 src = fetchurl {
1313 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
14− sha256 = "00rwi6z0068pbq01sq2d389ffcqsh3ylq3i8zkrqvblqid1hvnlv";
14+ sha256 = "1qm01hdd5yp8chig62bj10912vclbdvywwczs84sfg4zci2phqwi";
1515 };
1616
1717 nativeBuildInputs = [
pkgs/desktops/gnome-3/games/gnome-mines/default.nix+3−3
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "gnome-mines";
6− version = "3.36.1";
6+ version = "40.0";
77
88 src = fetchurl {
9− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "0m2680r94nk61imym4x73j03jwfjd8cxm592m5ybiqdfdw6i723i";
9+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
10+ sha256 = "0sf6kdvhr4pr3hddnj6ql9larz2wy108sri31id6x9g459nbly8z";
1111 };
1212
1313 # gobject-introspection for finding vapi files
pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix+54−9
@@ -1,7 +1,26 @@
1−{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook
2−, librsvg, gsound, clutter-gtk, gettext, itstool, vala, python3
3−, libxml2, libgee, libgnome-games-support, meson, ninja
4−, desktop-file-utils, hicolor-icon-theme}:
1+{ lib
2+, stdenv
3+, fetchurl
4+, fetchpatch
5+, pkg-config
6+, gnome3
7+, gtk3
8+, wrapGAppsHook
9+, librsvg
10+, gsound
11+, clutter-gtk
12+, gettext
13+, itstool
14+, vala
15+, python3
16+, libxml2
17+, libgee
18+, libgnome-games-support
19+, meson
20+, ninja
21+, desktop-file-utils
22+, hicolor-icon-theme
23+}:
524
625stdenv.mkDerivation rec {
726 pname = "gnome-nibbles";
@@ -12,14 +31,40 @@ stdenv.mkDerivation rec {
1231 sha256 = "1naknfbciydbym79a0jq039xf0033z8gyln48c0qsbcfr2qn8yj5";
1332 };
1433
34+ patches = [
35+ # Fix build with recent Vala.
36+ (fetchpatch {
37+ url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/62964e9256fcac616109af874dbb2bd8342a9853.patch";
38+ sha256 = "4VijELRxycS8rwi1HU9U3h9K/VtdQjJntfdtMN9Uz34=";
39+ })
40+ (fetchpatch {
41+ url = "https://gitlab.gnome.org/GNOME/gnome-nibbles/-/commit/1b48446068608aff9b5edf1fdbd4b8c0d9f0be94.patch";
42+ sha256 = "X0+Go5ae4F06WTPDYc2HIIax8X4RDgUGO6A6Qp8UifQ=";
43+ })
44+ ];
45+
1546 nativeBuildInputs = [
16− meson ninja vala python3
17− pkg-config wrapGAppsHook gettext itstool libxml2
18− desktop-file-utils hicolor-icon-theme
47+ meson
48+ ninja
49+ vala
50+ python3
51+ pkg-config
52+ wrapGAppsHook
53+ gettext
54+ itstool
55+ libxml2
56+ desktop-file-utils
57+ hicolor-icon-theme
1958 ];
59+
2060 buildInputs = [
21− gtk3 librsvg gsound clutter-gtk gnome3.adwaita-icon-theme
22− libgee libgnome-games-support
61+ gtk3
62+ librsvg
63+ gsound
64+ clutter-gtk
65+ gnome3.adwaita-icon-theme
66+ libgee
67+ libgnome-games-support
2368 ];
2469
2570 passthru = {
pkgs/desktops/gnome-3/games/gnome-robots/default.nix+49−14
@@ -1,26 +1,54 @@
1−{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook
2−, librsvg, gsound, gettext, itstool, libxml2, libgnome-games-support
3−, libgee, meson, ninja, python3, desktop-file-utils, adwaita-icon-theme }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, pkg-config
5+, gnome3
6+, gtk3
7+, wrapGAppsHook
8+, librsvg
9+, gsound
10+, gettext
11+, itstool
12+, libxml2
13+, libgnome-games-support
14+, libgee
15+, meson
16+, ninja
17+, vala
18+, python3
19+, desktop-file-utils
20+, adwaita-icon-theme
21+}:
422
523stdenv.mkDerivation rec {
624 pname = "gnome-robots";
7− version = "3.38.0";
25+ version = "40.0";
826
927 src = fetchurl {
10− url = "mirror://gnome/sources/gnome-robots/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "1qpzpsyj9i5dsfy7anfb2dcm602bjkcgqj86fxvnxy6llx56ks0z";
12− };
13−
14− passthru = {
15− updateScript = gnome3.updateScript { packageName = "gnome-robots"; attrPath = "gnome3.gnome-robots"; };
28+ url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/${pname}-${version}.tar.xz";
29+ sha256 = "04fbykj576dq1h6cycgfhh8wd6yxmlsqykvj188sbwahay42zgvg";
1630 };
1731
1832 nativeBuildInputs = [
19− pkg-config meson ninja python3
20− libxml2 wrapGAppsHook gettext itstool desktop-file-utils
33+ pkg-config
34+ meson
35+ ninja
36+ vala
37+ python3
38+ libxml2
39+ wrapGAppsHook
40+ gettext
41+ itstool
42+ desktop-file-utils
2143 ];
44+
2245 buildInputs = [
23− gtk3 librsvg gsound libgnome-games-support libgee adwaita-icon-theme
46+ gtk3
47+ librsvg
48+ gsound
49+ libgnome-games-support
50+ libgee
51+ adwaita-icon-theme
2452 ];
2553
2654 postPatch = ''
@@ -28,11 +56,18 @@ stdenv.mkDerivation rec {
2856 patchShebangs build-aux/meson_post_install.py
2957 '';
3058
59+ passthru = {
60+ updateScript = gnome3.updateScript {
61+ packageName = "gnome-robots";
62+ attrPath = "gnome3.gnome-robots";
63+ };
64+ };
65+
3166 meta = with lib; {
3267 homepage = "https://wiki.gnome.org/Apps/Robots";
3368 description = "Avoid the robots and make them crash into each other";
3469 maintainers = teams.gnome.members;
35− license = licenses.gpl2;
70+ license = licenses.gpl3Plus;
3671 platforms = platforms.linux;
3772 };
3873}
pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix+3−3
@@ -3,11 +3,11 @@
33
44stdenv.mkDerivation rec {
55 pname = "gnome-sudoku";
6− version = "3.38.0";
6+ version = "40.1";
77
88 src = fetchurl {
9− url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "0cpxx63liczmax6ry06r5k0f221xpg2rqh49vkdj2snmqq61swrq";
9+ url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz";
10+ sha256 = "1nr1g4q1gxqbzmaz15y3zgssnj7w01cq9l422ja4rglyg0fwjhbm";
1111 };
1212
1313 nativeBuildInputs = [ meson ninja vala pkg-config gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ];
pkgs/desktops/gnome-3/games/gnome-taquin/default.nix+50−10
@@ -1,6 +1,21 @@
1−{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook
2−, librsvg, gsound, gettext, itstool, libxml2
3−, meson, ninja, vala, python3, desktop-file-utils
1+{ lib
2+, stdenv
3+, fetchurl
4+, fetchpatch
5+, pkg-config
6+, gnome3
7+, gtk3
8+, wrapGAppsHook
9+, librsvg
10+, gsound
11+, gettext
12+, itstool
13+, libxml2
14+, meson
15+, ninja
16+, vala
17+, python3
18+, desktop-file-utils
419}:
520
621stdenv.mkDerivation rec {
@@ -12,24 +27,49 @@ stdenv.mkDerivation rec {
1227 sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn";
1328 };
1429
15− passthru = {
16− updateScript = gnome3.updateScript { packageName = "gnome-taquin"; attrPath = "gnome3.gnome-taquin"; };
17− };
30+ patches = [
31+ # Fix build with recent Vala.
32+ (fetchpatch {
33+ url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/99dea5e7863e112f33f16e59898c56a4f1a547b3.patch";
34+ sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4=";
35+ })
36+ (fetchpatch {
37+ url = "https://gitlab.gnome.org/GNOME/gnome-taquin/-/commit/66be44dc20d114e449fc33156e3939fd05dfbb16.patch";
38+ sha256 = "RN41RCLHlJyXTARSH9qjsmpYi1UFeMRssoYxRsbngDQ=";
39+ })
40+ ];
1841
1942 nativeBuildInputs = [
20− pkg-config wrapGAppsHook meson ninja python3
21− gettext itstool libxml2 vala desktop-file-utils
43+ pkg-config
44+ wrapGAppsHook
45+ meson
46+ ninja
47+ python3
48+ gettext
49+ itstool
50+ libxml2
51+ vala
52+ desktop-file-utils
2253 ];
2354 buildInputs = [
24− gtk3 librsvg gsound
55+ gtk3
56+ librsvg
57+ gsound
2558 gnome3.adwaita-icon-theme
2659 ];
2760
61+ passthru = {
62+ updateScript = gnome3.updateScript {
63+ packageName = "gnome-taquin";
64+ attrPath = "gnome3.gnome-taquin";
65+ };
66+ };
67+
2868 meta = with lib; {
2969 homepage = "https://wiki.gnome.org/Apps/Taquin";
3070 description = "Move tiles so that they reach their places";
3171 maintainers = teams.gnome.members;
32− license = licenses.gpl3;
72+ license = licenses.gpl3Plus;
3373 platforms = platforms.linux;
3474 };
3575}
pkgs/desktops/gnome-3/games/iagno/default.nix+14
@@ -26,6 +26,20 @@ stdenv.mkDerivation rec {
2626 sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4";
2727 };
2828
29+ patches = [
30+ # Fix build with recent Vala.
31+ # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/15
32+ (fetchpatch {
33+ url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/e8a0aeec350ea80349582142c0e8e3cd3f1bce38.patch";
34+ sha256 = "OO1x0Yx56UFzHTBsPAMYAjnJHlnTjdO1Vk7q6XU8wKQ=";
35+ })
36+ # https://gitlab.gnome.org/GNOME/dconf-editor/-/merge_requests/13
37+ (fetchpatch {
38+ url = "https://gitlab.gnome.org/GNOME/iagno/-/commit/508c0f94e5f182e50ff61be6e04f72574dee97cb.patch";
39+ sha256 = "U7djuMhb1XJaKAPyogQjaunOkbBK24r25YD7BgH05P4=";
40+ })
41+ ];
42+
2943 nativeBuildInputs = [
3044 meson
3145 ninja
pkgs/desktops/gnome-3/games/lightsoff/default.nix+3−3
@@ -4,11 +4,11 @@
44
55stdenv.mkDerivation rec {
66 pname = "lightsoff";
7− version = "3.38.0";
7+ version = "40.0.1";
88
99 src = fetchurl {
10− url = "mirror://gnome/sources/lightsoff/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "0dpnnw8v1yk1p0y08f9c9xkgswqlm8x83dfn96798nif2zbypdnh";
10+ url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/${pname}-${version}.tar.xz";
11+ sha256 = "1aziy64g15bm83zfn3ifs20z9yvscdvsxbx132xnq77i0r3qvlxc";
1212 };
1313
1414 nativeBuildInputs = [
pkgs/desktops/gnome-3/games/swell-foop/default.nix+51−16
@@ -1,32 +1,67 @@
1−{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, glib, gtk3, gnome3, desktop-file-utils
2−, clutter, clutter-gtk, gettext, itstool, libxml2, wrapGAppsHook, python3 }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, meson
5+, ninja
6+, pkg-config
7+, vala
8+, glib
9+, gtk3
10+, libgnome-games-support
11+, gnome3
12+, desktop-file-utils
13+, clutter
14+, clutter-gtk
15+, gettext
16+, itstool
17+, libxml2
18+, wrapGAppsHook
19+, python3
20+}:
321
4−let
22+stdenv.mkDerivation rec {
523 pname = "swell-foop";
6− version = "3.34.1";
7−in stdenv.mkDerivation rec {
8− name = "${pname}-${version}";
24+ version = "40.1";
925
1026 src = fetchurl {
11− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
12− sha256 = "1032psxm59nissi268bh3j964m4a0n0ah4dy1pf0ph27j3zvdik1";
27+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
28+ sha256 = "17r4b0g8s7z872wdd7ngk248z7fqx43vm2sym1bdqhzsi250s1y1";
1329 };
1430
15− passthru = {
16− updateScript = gnome3.updateScript {
17− packageName = pname;
18− attrPath = "gnome3.${pname}";
19− };
20− };
31+ nativeBuildInputs = [
32+ meson
33+ ninja
34+ vala
35+ pkg-config
36+ wrapGAppsHook
37+ python3
38+ itstool
39+ gettext
40+ libxml2
41+ desktop-file-utils
42+ ];
2143
22− nativeBuildInputs = [ meson ninja vala pkg-config wrapGAppsHook python3 itstool gettext libxml2 desktop-file-utils ];
23− buildInputs = [ glib gtk3 gnome3.adwaita-icon-theme clutter clutter-gtk ];
44+ buildInputs = [
45+ glib
46+ gtk3
47+ libgnome-games-support
48+ gnome3.adwaita-icon-theme
49+ clutter
50+ clutter-gtk
51+ ];
2452
2553 postPatch = ''
2654 chmod +x meson_post_install.py # patchShebangs requires executable file
2755 patchShebangs meson_post_install.py
2856 '';
2957
58+ passthru = {
59+ updateScript = gnome3.updateScript {
60+ packageName = pname;
61+ attrPath = "gnome3.${pname}";
62+ };
63+ };
64+
3065 meta = with lib; {
3166 homepage = "https://wiki.gnome.org/Apps/Swell%20Foop";
3267 description = "Puzzle game, previously known as Same GNOME";
pkgs/desktops/gnome-3/games/tali/default.nix+3−3
@@ -5,11 +5,11 @@
55
66stdenv.mkDerivation rec {
77 pname = "tali";
8− version = "3.38.3";
8+ version = "40.0";
99
1010 src = fetchurl {
11− url = "mirror://gnome/sources/tali/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "AhVCi1DEoIJ/sN4uTmum5WZ4+bp22NJbfuyoUhXyWjk=";
11+ url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz";
12+ sha256 = "19gic6yjg3bg6jf87zvhm7ihsz1y58dz86p4x3a16xdhjyrk40q2";
1313 };
1414
1515 passthru = {
pkgs/desktops/gnome-3/misc/geary/Bump-client-test-timeout-to-300s.patchdeleted−10
@@ -1,10 +0,0 @@
1−diff --git a/test/meson.build b/test/meson.build
2−index 6ea5e27a..450c03e3 100644
3−--- a/test/meson.build
4−+++ b/test/meson.build
5−@@ -167,4 +167,4 @@ test_integration_bin = executable('test-integration',
6− )
7−
8− test('engine-tests', test_engine_bin)
9−-test('client-tests', test_client_bin)
10−+test('client-tests', test_client_bin, timeout: 300)
pkgs/desktops/gnome-3/misc/geary/default.nix+18−15
@@ -1,4 +1,5 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchurl
34, pkg-config
45, gtk3
@@ -15,6 +16,7 @@
1516, libsecret
1617, gmime3
1718, isocodes
19+, icu
1820, libxml2
1921, gettext
2022, sqlite
@@ -37,6 +39,7 @@
3739, gobject-introspection
3840, gspell
3941, appstream-glib
42+, libstemmer
4043, libytnef
4144, libhandy
4245, gsound
@@ -44,18 +47,13 @@
4447
4548stdenv.mkDerivation rec {
4649 pname = "geary";
47− version = "3.38.1";
50+ version = "40.0";
4851
4952 src = fetchurl {
50− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
51− sha256 = "04p8fjkz4xp5afp0ld1m09pnv0zkcx51l7hf23amfrjkk0kj2bp7";
53+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
54+ sha256 = "1c2nd35500ng28223y5pszc7fh8g16njj34f6p5xc9594lvj0mik";
5255 };
5356
54− patches = [
55− # Longer timeout for client test.
56− ./Bump-client-test-timeout-to-300s.patch
57− ];
58−
5957 nativeBuildInputs = [
6058 appstream-glib
6159 desktop-file-utils
@@ -84,12 +82,14 @@ stdenv.mkDerivation rec {
8482 gspell
8583 gtk3
8684 isocodes
85+ icu
8786 json-glib
8887 libgee
8988 libhandy
9089 libpeas
9190 libsecret
9291 libunwind
92+ libstemmer
9393 libytnef
9494 sqlite
9595 webkitgtk
@@ -104,7 +104,8 @@ stdenv.mkDerivation rec {
104104 ];
105105
106106 mesonFlags = [
107− "-Dcontractor=true" # install the contractor file (Pantheon specific)
107+ "-Dprofile=release"
108+ "-Dcontractor=enabled" # install the contractor file (Pantheon specific)
108109 ];
109110
110111 # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see:
@@ -118,21 +119,23 @@ stdenv.mkDerivation rec {
118119 patchShebangs build-aux/yaml_to_json.py
119120
120121 chmod +x desktop/geary-attach
121−
122− # Drop test that breaks after webkitgtk 2.32.0 update
123− # https://gitlab.gnome.org/GNOME/geary/-/issues/1180
124− sed -i '/add_test("edit_context_font", edit_context_font);/d' test/js/composer-page-state-test.vala
125122 '';
126123
127− doCheck = true;
124+ # Some tests time out.
125+ doCheck = false;
128126
129127 checkPhase = ''
128+ runHook preCheck
129+
130130 NO_AT_BRIDGE=1 \
131131 GIO_EXTRA_MODULES=$GIO_EXTRA_MODULES:${glib-networking}/lib/gio/modules \
132+ HOME=$TMPDIR \
132133 XDG_DATA_DIRS=$XDG_DATA_DIRS:${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${shared-mime-info}/share:${folks}/share/gsettings-schemas/${folks.name} \
133134 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
134135 --config-file=${dbus.daemon}/share/dbus-1/session.conf \
135136 meson test -v --no-stdsplit
137+
138+ runHook postCheck
136139 '';
137140
138141 preFixup = ''
pkgs/desktops/gnome-3/misc/gitg/default.nix+21−23
@@ -1,6 +1,6 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchurl
3−, fetchpatch
44, vala
55, gettext
66, pkg-config
@@ -36,16 +36,16 @@ stdenv.mkDerivation rec {
3636 sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914";
3737 };
3838
39− postPatch = ''
40− chmod +x meson_post_install.py
41− patchShebangs meson_post_install.py
42−
43− substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash"
44− '';
45−
46− doCheck = true;
47−
48− enableParallelBuilding = true;
39+ nativeBuildInputs = [
40+ gobject-introspection
41+ gettext
42+ meson
43+ ninja
44+ pkg-config
45+ python3
46+ vala
47+ wrapGAppsHook
48+ ];
4949
5050 buildInputs = [
5151 adwaita-icon-theme
@@ -63,16 +63,14 @@ stdenv.mkDerivation rec {
6363 libsoup
6464 ];
6565
66− nativeBuildInputs = [
67− gobject-introspection
68− gettext
69− meson
70− ninja
71− pkg-config
72− python3
73− vala
74− wrapGAppsHook
75− ];
66+ doCheck = false; # FAIL: tests-gitg gtk_style_context_add_provider_for_screen: assertion 'GDK_IS_SCREEN (screen)' failed
67+
68+ postPatch = ''
69+ chmod +x meson_post_install.py
70+ patchShebangs meson_post_install.py
71+
72+ substituteInPlace tests/libgitg/test-commit.vala --replace "/bin/bash" "${bash}/bin/bash"
73+ '';
7674
7775 preFixup = ''
7876 gappsWrapperArgs+=(
@@ -91,7 +89,7 @@ stdenv.mkDerivation rec {
9189 homepage = "https://wiki.gnome.org/Apps/Gitg";
9290 description = "GNOME GUI client to view git repositories";
9391 maintainers = with maintainers; [ domenkozar ];
94− license = licenses.gpl2;
92+ license = licenses.gpl2Plus;
9593 platforms = platforms.linux;
9694 };
9795}
pkgs/desktops/gnome-3/misc/gnome-applets/default.nix+5−3
@@ -16,17 +16,18 @@
1616, adwaita-icon-theme
1717, libgweather
1818, gucharmap
19+, tracker
1920, polkit
2021, gnome3
2122}:
2223
2324stdenv.mkDerivation rec {
2425 pname = "gnome-applets";
25− version = "3.38.0";
26+ version = "3.40.0";
2627
2728 src = fetchurl {
2829 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
29− sha256 = "04qrzycwm7pz556agl08xw3d0r1mmr4ja9n9jfijjxs9inrhp5yc";
30+ sha256 = "1k6mdkg16ia29fyg8ikf4dfs51gnrmg0f8xwpvd3192lhfsbsh19";
3031 };
3132
3233 nativeBuildInputs = [
@@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
4849 adwaita-icon-theme
4950 libgweather
5051 gucharmap
51− # tracker # Tracker 3 not supported.
52+ tracker
5253 polkit
5354 wirelesstools
5455 linuxPackages.cpupower
@@ -65,6 +66,7 @@ stdenv.mkDerivation rec {
6566 updateScript = gnome3.updateScript {
6667 packageName = pname;
6768 attrPath = "gnome3.${pname}";
69+ versionPolicy = "odd-unstable";
6870 };
6971 };
7072
pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix+2−2
@@ -11,13 +11,13 @@
1111
1212stdenv.mkDerivation rec {
1313 pname = "gnome-autoar";
14− version = "0.3.1";
14+ version = "0.3.2";
1515
1616 outputs = [ "out" "dev" ];
1717
1818 src = fetchurl {
1919 url = "mirror://gnome/sources/gnome-autoar/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
20− sha256 = "1y6hh5dldhdq7mpbmd571zl0yadfackvifhnxvykkqqddwz72y0f";
20+ sha256 = "0wkwix44yg126xn1v4f2j60bv9yiyadfpzf8ifx0bvd9x5f4v354";
2121 };
2222
2323 passthru = {
pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix+3−2
@@ -30,7 +30,7 @@
3030}:
3131let
3232 pname = "gnome-flashback";
33− version = "3.38.0";
33+ version = "3.40.0";
3434
3535 # From data/sessions/Makefile.am
3636 requiredComponentsCommon = [
@@ -61,7 +61,7 @@ let
6161
6262 src = fetchurl {
6363 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
64− sha256 = "1r51yqdqichp4jv54kiaqrh0xhykngr4ymlvrkjhzdhivwadsg4m";
64+ sha256 = "0fxv13m2q9z1q3i9jbggl35cb7jlckbdrfsr5sf030hr1w836gz0";
6565 };
6666
6767 # make .desktop Execs absolute
@@ -123,6 +123,7 @@ let
123123 updateScript = gnome3.updateScript {
124124 packageName = pname;
125125 attrPath = "gnome3.${pname}";
126+ versionPolicy = "odd-unstable";
126127 };
127128
128129 mkSessionForWm = { wmName, wmLabel, wmCommand }:
pkgs/desktops/gnome-3/misc/gnome-panel/default.nix+3−2
@@ -23,13 +23,13 @@
2323
2424stdenv.mkDerivation rec {
2525 pname = "gnome-panel";
26− version = "3.38.0";
26+ version = "3.40.0";
2727
2828 outputs = [ "out" "dev" "man" ];
2929
3030 src = fetchurl {
3131 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
32− hash = "sha256-GosVrvCgKmyqm5IJyNP7Q+e5h6OAB2aRwj8DFOwwLxU=";
32+ hash = "sha256-nxNQde3GZs8rnKkd41xnA+KxdxwQp3B0FPtlbCilmzs=";
3333 };
3434
3535 # make .desktop Exec absolute
@@ -85,6 +85,7 @@ stdenv.mkDerivation rec {
8585 updateScript = gnome3.updateScript {
8686 packageName = pname;
8787 attrPath = "gnome3.${pname}";
88+ versionPolicy = "odd-unstable";
8889 };
8990 };
9091
pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix+7−7
@@ -10,7 +10,7 @@
1010, gsettings-desktop-schemas
1111, gtk3
1212, itstool
13−, libhandy_0
13+, libhandy
1414, libnotify
1515, libsoup
1616, libxml2
@@ -20,13 +20,13 @@
2020
2121python3Packages.buildPythonApplication rec {
2222 pname = "gnome-tweaks";
23− version = "3.34.1";
23+ version = "40.0";
2424 format = "other";
2525 strictDeps = false; # https://github.com/NixOS/nixpkgs/issues/56943
2626
2727 src = fetchurl {
28− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
29− sha256 = "19y62dj4n5i6v4zpjllxl51dch6ndy8xs45v5aqmmq9xyfrqk5yq";
28+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
29+ sha256 = "+V8/4DGwsBwC95oWWfiJFS03cq4+RN+EA9FGC6Xuw2o=";
3030 };
3131
3232 nativeBuildInputs = [
@@ -51,7 +51,7 @@ python3Packages.buildPythonApplication rec {
5151 gnome3.mutter
5252 gsettings-desktop-schemas
5353 gtk3
54− libhandy_0
54+ libhandy
5555 libnotify
5656 libsoup
5757 ];
@@ -72,10 +72,10 @@ python3Packages.buildPythonApplication rec {
7272 };
7373
7474 meta = with lib; {
75− homepage = "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool";
75+ homepage = "https://wiki.gnome.org/Apps/Tweaks";
7676 description = "A tool to customize advanced GNOME 3 options";
7777 maintainers = teams.gnome.members;
78− license = licenses.gpl3;
78+ license = licenses.gpl3Plus;
7979 platforms = platforms.linux;
8080 };
8181}
pkgs/desktops/gnome-3/misc/gpaste/default.nix+2−2
@@ -17,14 +17,14 @@
1717}:
1818
1919stdenv.mkDerivation rec {
20− version = "3.38.6";
20+ version = "3.40.2";
2121 pname = "gpaste";
2222
2323 src = fetchFromGitHub {
2424 owner = "Keruspe";
2525 repo = "GPaste";
2626 rev = "v${version}";
27− sha256 = "sha256-6CIzOBq/Y9XKiv/lQAtDYK6bxhT1WxjbXhu4+noO5nI=";
27+ sha256 = "sha256-DUikcnkDBRkCwPLrl8lkNr+SeNpc3bPwPTWRn91nOo4=";
2828 };
2929
3030 patches = [
pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch+1−1
@@ -17,7 +17,7 @@
1717
1818+imports.gi.GIRepository.Repository.prepend_search_path('@typelibPath@');
1919+
20− const { GPaste } = imports.gi;
20+ //const { GPaste } = imports.gi;
2121
2222 const ExtensionUtils = imports.misc.extensionUtils;
2323--- a/src/libgpaste/settings/gpaste-settings.c
pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix+3−2
@@ -14,11 +14,11 @@
1414
1515stdenv.mkDerivation rec {
1616 pname = "libgnome-games-support";
17− version = "1.8.0";
17+ version = "1.8.1";
1818
1919 src = fetchurl {
2020 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
21− sha256 = "1pdk9hc30xdlv0ba24f7pvcr2d5370zykrmpws7hgmjgl4wfbpdb";
21+ sha256 = "0gs1k88wwafn5cdyb5yq1cxpi9azachb0ysxgwh15sx77g6plyy3";
2222 };
2323
2424 nativeBuildInputs = [
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
4444 updateScript = gnome3.updateScript {
4545 packageName = pname;
4646 attrPath = "gnome3.${pname}";
47+ versionPolicy = "odd-unstable";
4748 };
4849 };
4950
pkgs/desktops/gnome-3/misc/metacity/default.nix+3−2
@@ -18,11 +18,11 @@
1818
1919stdenv.mkDerivation rec {
2020 pname = "metacity";
21− version = "3.38.0";
21+ version = "3.40.0";
2222
2323 src = fetchurl {
2424 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
25− sha256 = "1b0i9sq6qa540f2006cv1p8i6lxg1h6w00apxwzwjpfqn0hk26c1";
25+ sha256 = "1d8mj2nshijshfiaica8dirfws1p6i9631frq7q23b3y91jiyk12";
2626 };
2727
2828 patches = [
@@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
5858 updateScript = gnome3.updateScript {
5959 packageName = pname;
6060 attrPath = "gnome3.${pname}";
61+ versionPolicy = "odd-unstable";
6162 };
6263 };
6364
pkgs/desktops/gnome-3/misc/nautilus-python/default.nix+1
@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
4949 updateScript = gnome3.updateScript {
5050 packageName = pname;
5151 attrPath = "gnome3.${pname}";
52+ versionPolicy = "odd-unstable";
5253 };
5354 };
5455
pkgs/desktops/gnome-3/update.nix+2−2
@@ -1,8 +1,8 @@
11{ stdenv, pkgs, lib, writeScript, python3, common-updater-scripts }:
2−{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable", freeze ? false }:
2+{ packageName, attrPath ? packageName, versionPolicy ? "tagged", freeze ? false }:
33
44let
5− python = python3.withPackages (p: [ p.requests ]);
5+ python = python3.withPackages (p: [ p.requests p.libversion ]);
66 upperBoundFlag =
77 let
88 package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs;
pkgs/desktops/pantheon/apps/appcenter/default.nix+10−1
@@ -37,9 +37,18 @@ stdenv.mkDerivation rec {
3737 owner = "elementary";
3838 repo = pname;
3939 rev = version;
40− sha256 = "sha256-8r0DlmG8xlCQ1uFHZQjXG2ls4VBrsRzrVY8Ey3/OYAU=";
40+ sha256 = "MsaXdmL+M+NYAJrrwluleeNxqQg0soFbO/G/FqibBFI=";
4141 };
4242
43+ patches = [
44+ # Allow build with appstream 0.14.x
45+ # https://github.com/elementary/appcenter/pull/1493
46+ (fetchpatch {
47+ url = "https://github.com/elementary/appcenter/commit/5807dd13fe3c715f26225aed8d7a0abdea0c2a64.patch";
48+ sha256 = "BvEahG9lU9ZdgooFDFhm5evRvnKVcmcHLdmZPb85gbo=";
49+ })
50+ ];
51+
4352 passthru = {
4453 updateScript = nix-update-script {
4554 attrPath = "pantheon.${pname}";
pkgs/desktops/pantheon/apps/elementary-calendar/default.nix+2
@@ -18,6 +18,7 @@
1818, python3
1919, libnotify
2020, libical
21+, libgdata
2122, evolution-data-server
2223, appstream-glib
2324, elementary-icon-theme
@@ -67,6 +68,7 @@ stdenv.mkDerivation rec {
6768 libgee
6869 libical
6970 libnotify
71+ libgdata # required by some dependency transitively
7072 ];
7173
7274 postPatch = ''
pkgs/desktops/pantheon/apps/elementary-code/default.nix+9
@@ -1,5 +1,6 @@
11{ lib, stdenv
22, fetchFromGitHub
3+, fetchpatch
34, nix-update-script
45, pantheon
56, pkg-config
@@ -39,6 +40,14 @@ stdenv.mkDerivation rec {
3940 sha256 = "sha256-4AEayj+K/lOW6jEYmvmdan1kTqqqLL1YzwcU7/3PH5U=";
4041 };
4142
43+ patches = [
44+ # Fix build with latest Vala.
45+ (fetchpatch {
46+ url = "https://github.com/elementary/code/commit/c50580d3336296823da9a2c50b824f21fde50286.patch";
47+ sha256 = "F+ZYlnZWYCU68G4oayLfbTnvSnTb4YA0zHVGD/Uf3KA=";
48+ })
49+ ];
50+
4251 passthru = {
4352 updateScript = nix-update-script {
4453 attrPath = "pantheon.${pname}";
pkgs/desktops/pantheon/apps/elementary-music/default.nix+9
@@ -1,5 +1,6 @@
11{ lib, stdenv
22, fetchFromGitHub
3+, fetchpatch
34, nix-update-script
45, pantheon
56, pkg-config
@@ -41,6 +42,14 @@ stdenv.mkDerivation rec {
4142 sha256 = "sha256-3GZoBCu9rF+BnNk9APBzKWO1JYg1XYWwrEvwcjWvYDE=";
4243 };
4344
45+ patches = [
46+ # Fix build with latest Vala.
47+ (fetchpatch {
48+ url = "https://github.com/elementary/music/commit/9ed3bbb3a0d68e289a772b4603f58e52a4973316.patch";
49+ sha256 = "fFO97SQzTc2fYFJFGfFPSUCdkCgZxfX1fjDQ7GH4BUs=";
50+ })
51+ ];
52+
4453 passthru = {
4554 updateScript = nix-update-script {
4655 attrPath = "pantheon.${pname}";
pkgs/desktops/pantheon/apps/elementary-photos/default.nix+9
@@ -1,5 +1,6 @@
11{ lib, stdenv
22, fetchFromGitHub
3+, fetchpatch
34, nix-update-script
45, pantheon
56, meson
@@ -45,6 +46,14 @@ stdenv.mkDerivation rec {
4546 sha256 = "sha256-bTk4shryAWWMrKX3mza6xQ05qpBPf80Ey7fmYgKLUiY=";
4647 };
4748
49+ patches = [
50+ # Fix build with latest Vala.
51+ (fetchpatch {
52+ url = "https://github.com/elementary/photos/commit/27e529fc96da828982563e2e19a6f0cef883a29e.patch";
53+ sha256 = "w39wh45VHggCs62TN6wpUEyz/hJ1y7qL1Ox+sp0Pt2s=";
54+ })
55+ ];
56+
4857 passthru = {
4958 updateScript = nix-update-script {
5059 attrPath = "pantheon.${pname}";
pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix+8
@@ -25,6 +25,14 @@ stdenv.mkDerivation rec {
2525 sha256 = "sha256-tnAJyyPN/Xy1pmlgBpgO2Eb5CeHrRltjQTHmuTPBt8s=";
2626 };
2727
28+ patches = [
29+ # Fix build with latest Vala.
30+ (fetchpatch {
31+ url = "https://github.com/elementary/switchboard-plug-printers/commit/5eced5ddda6f229d7265ea0a713f6c1cd181a526.patch";
32+ sha256 = "lPTNqka6jjvv1JnAqVzVIQBIdDXlCOQ5ASvgZNuEUC8=";
33+ })
34+ ];
35+
2836 passthru = {
2937 updateScript = nix-update-script {
3038 attrPath = "pantheon.${pname}";
pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix+9
@@ -1,5 +1,6 @@
11{ lib, stdenv
22, fetchFromGitHub
3+, fetchpatch
34, nix-update-script
45, pantheon
56, meson
@@ -28,6 +29,14 @@ stdenv.mkDerivation rec {
2829 sha256 = "sha256-Sws6FqUL7QAROInDrcqYAp6j1TCC4aGV0/hi5Kmm5wQ=";
2930 };
3031
32+ patches = [
33+ # Fix build with latest Vala.
34+ (fetchpatch {
35+ url = "https://github.com/elementary/switchboard-plug-security-privacy/commit/c8e422e630bbee0badcf4df26364c9e83e06bad0.patch";
36+ sha256 = "5Gm+muZiCraJC5JaGVVo0HDJ7KxjOpclHRW1RKsk3bc=";
37+ })
38+ ];
39+
3140 passthru = {
3241 updateScript = nix-update-script {
3342 attrPath = "pantheon.${pname}";
pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix+2
@@ -15,6 +15,7 @@
1515, libgee
1616, libxml2
1717, libsoup
18+, libgdata
1819, elementary-calendar
1920}:
2021
@@ -52,6 +53,7 @@ stdenv.mkDerivation rec {
5253 libical
5354 libsoup
5455 wingpanel
56+ libgdata # required by some dependency transitively
5557 ];
5658
5759 postPatch = ''
pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix+15
@@ -2,6 +2,7 @@
22, substituteAll
33, fetchurl
44, fetchgit
5+, fetchpatch
56, meson
67, ninja
78, pkg-config
@@ -73,6 +74,20 @@ stdenv.mkDerivation rec {
7374 #"${patchPath}/ubuntu_ibus_configs.patch"
7475 # https://github.com/elementary/os-patches/blob/6975d1c254cb6ab913b8e2396877203aea8eaa65/debian/patches/elementary-dpms.patch
7576 ./elementary-dpms.patch
77+
78+ # Query GWeather DB on the fly instead of caching.
79+ # Needed for the next patch to apply.
80+ # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/merge_requests/175
81+ (fetchpatch {
82+ url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/df6c69f028d27b53ac86829e11df103b25ed5a74.patch";
83+ sha256 = "bKZkPzN64DXMgitjn0vUzUvKl7ldhN/mNVtPKVmHd0Q=";
84+ })
85+ # Adjust to libgweather changes.
86+ # https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/217
87+ (fetchpatch {
88+ url = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/82d88014dfca2df7e081712870e1fb017c16b808.patch";
89+ sha256 = "H5k/v+M2bRaswt5nrDJFNn4gS4BdB0UfzdjUCT4yLKg=";
90+ })
7691 ];
7792
7893 nativeBuildInputs = [
pkgs/development/compilers/vala/default.nix+10−3
@@ -40,6 +40,8 @@ let
4040
4141 "0.50" = ./disable-graphviz-0.46.1.patch;
4242
43+ "0.52" = ./disable-graphviz-0.46.1.patch;
44+
4345 }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala");
4446
4547 disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz;
@@ -125,8 +127,8 @@ in rec {
125127 };
126128
127129 vala_0_48 = generic {
128− version = "0.48.14";
129− sha256 = "0iz3zzimmk5wxvy5bi75v8ckv153gjrz3r5iqvl8xqackzi7v9fw";
130+ version = "0.48.17";
131+ sha256 = "1wlb4vd7k6hg10s09npglbhfcgjzxkywd4v0l96qhn19m9b8cszj";
130132 };
131133
132134 vala_0_50 = generic {
@@ -134,5 +136,10 @@ in rec {
134136 sha256 = "1353j852h04d1x6b4n6lbg3ay40ph0adb9yi25dh74pligx33z2q";
135137 };
136138
137− vala = vala_0_48;
139+ vala_0_52 = generic {
140+ version = "0.52.2";
141+ sha256 = "sha256-OjxGCAO6Zh5RO+PQmEtYPgVHP2AsdfqY6RdVUDcUqXs=";
142+ };
143+
144+ vala = vala_0_52;
138145}
pkgs/development/libraries/amtk/default.nix+11−4
@@ -1,6 +1,8 @@
11{ lib, stdenv
22, fetchurl
33, gtk3
4+, meson
5+, ninja
46, pkg-config
57, gobject-introspection
68, gnome3
@@ -10,14 +12,16 @@
1012
1113stdenv.mkDerivation rec {
1214 pname = "amtk";
13− version = "5.2.0";
15+ version = "5.3.1";
1416
1517 src = fetchurl {
1618 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
17− sha256 = "0y3hmmflw4i0y0yb9a8rlihbv3cbwnvdcf1n5jycwzpq9jxla1c2";
19+ sha256 = "12v3nj1bb7507ndprjggq0hpz8k719b4bwvl8sm43p3ibmn27anm";
1820 };
1921
2022 nativeBuildInputs = [
23+ meson
24+ ninja
2125 pkg-config
2226 dbus
2327 gobject-introspection
@@ -32,10 +36,13 @@ stdenv.mkDerivation rec {
3236 export NO_AT_BRIDGE=1
3337 ${xvfb_run}/bin/xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
3438 --config-file=${dbus.daemon}/share/dbus-1/session.conf \
35− make check
39+ meson test --print-errorlogs
3640 '';
3741
38− passthru.updateScript = gnome3.updateScript { packageName = pname; };
42+ passthru.updateScript = gnome3.updateScript {
43+ packageName = pname;
44+ versionPolicy = "none";
45+ };
3946
4047 meta = with lib; {
4148 homepage = "https://wiki.gnome.org/Projects/Amtk";
pkgs/development/libraries/appstream/default.nix+54−16
@@ -1,20 +1,40 @@
1−{ lib, stdenv, substituteAll, fetchFromGitHub, meson, ninja, pkg-config, gettext
2−, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
3−, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection
4−, pcre, itstool, gperf, vala, lmdb, libsoup
1+{ lib
2+, stdenv
3+, substituteAll
4+, fetchFromGitHub
5+, meson
6+, ninja
7+, pkg-config
8+, gettext
9+, xmlto
10+, docbook-xsl-nons
11+, docbook_xml_dtd_45
12+, libxslt
13+, libstemmer
14+, glib
15+, xapian
16+, libxml2
17+, libyaml
18+, gobject-introspection
19+, pcre
20+, itstool
21+, gperf
22+, vala
23+, lmdb
24+, curl
525}:
626
727stdenv.mkDerivation rec {
828 pname = "appstream";
9− version = "0.14.0";
29+ version = "0.14.3";
1030
1131 outputs = [ "out" "dev" ];
1232
1333 src = fetchFromGitHub {
14− owner = "ximion";
15− repo = "appstream";
16− rev = "v${version}";
17− sha256 = "sha256-iYqmQ1/58t3ZdJTxYLDc5jkTG1lMBtQWMFFsYsszH9Q=";
34+ owner = "ximion";
35+ repo = "appstream";
36+ rev = "v${version}";
37+ sha256 = "sha256-wCQR+4/F5lVqWHHcH/WS4irBGRivz3c1imasyLDIZIs=";
1838 };
1939
2040 patches = [
@@ -26,12 +46,30 @@ stdenv.mkDerivation rec {
2646 ];
2747
2848 nativeBuildInputs = [
29− meson ninja pkg-config gettext
30− libxslt xmlto docbook_xsl docbook_xml_dtd_45
31− gobject-introspection itstool vala
49+ meson
50+ ninja
51+ pkg-config
52+ gettext
53+ libxslt
54+ xmlto
55+ docbook-xsl-nons
56+ docbook_xml_dtd_45
57+ gobject-introspection
58+ itstool
59+ vala
3260 ];
3361
34− buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ];
62+ buildInputs = [
63+ libstemmer
64+ pcre
65+ glib
66+ xapian
67+ libxml2
68+ libyaml
69+ gperf
70+ lmdb
71+ curl
72+ ];
3573
3674 mesonFlags = [
3775 "-Dapidocs=false"
@@ -41,14 +79,14 @@ stdenv.mkDerivation rec {
4179
4280 meta = with lib; {
4381 description = "Software metadata handling library";
44− homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/";
82+ homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/";
4583 longDescription = ''
4684 AppStream is a cross-distro effort for building Software-Center applications
4785 and enhancing metadata provided by software components. It provides
4886 specifications for meta-information which is shipped by upstream projects and
4987 can be consumed by other software.
5088 '';
51− license = licenses.lgpl21Plus;
52− platforms = platforms.unix;
89+ license = licenses.lgpl21Plus;
90+ platforms = platforms.unix;
5391 };
5492}
pkgs/development/libraries/at-spi2-atk/default.nix+1
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
3131 passthru = {
3232 updateScript = gnome3.updateScript {
3333 packageName = pname;
34+ versionPolicy = "odd-unstable";
3435 };
3536 };
3637
pkgs/development/libraries/at-spi2-core/default.nix+6−3
@@ -14,23 +14,25 @@
1414, libX11
1515, libXtst # at-spi2-core can be build without X support, but due it is a client-side library, GUI-less usage is a very rare case
1616, libXi
17+, libXext
1718
1819, gnome3 # To pass updateScript
1920}:
2021
2122stdenv.mkDerivation rec {
2223 pname = "at-spi2-core";
23− version = "2.38.0";
24+ version = "2.40.1";
2425
2526 src = fetchurl {
2627 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
27− sha256 = "hONsP+ZoYhM/X+Ipdyt2qiUm4Q3lAUo3ePL6Rs5VDaU=";
28+ sha256 = "0miqn8531czy9ffpxnsxsnk12w3d6sqjda3qyix8kns2xsjf6rlz";
2829 };
2930
3031 outputs = [ "out" "dev" ];
3132
3233 nativeBuildInputs = [ meson ninja pkg-config gobject-introspection makeWrapper ];
33− buildInputs = [ libX11 libXtst libXi ];
34+ # libXext is a transitive dependency of libXi
35+ buildInputs = [ libX11 libXtst libXi libXext ];
3436 # In atspi-2.pc dbus-1 glib-2.0
3537 propagatedBuildInputs = [ dbus glib ];
3638
@@ -45,6 +47,7 @@ stdenv.mkDerivation rec {
4547 passthru = {
4648 updateScript = gnome3.updateScript {
4749 packageName = pname;
50+ versionPolicy = "odd-unstable";
4851 };
4952 };
5053
pkgs/development/libraries/atk/default.nix+1
@@ -36,6 +36,7 @@ stdenv.mkDerivation rec {
3636 passthru = {
3737 updateScript = gnome3.updateScript {
3838 packageName = pname;
39+ versionPolicy = "odd-unstable";
3940 };
4041 };
4142
pkgs/development/libraries/atkmm/default.nix+1
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
2020 passthru = {
2121 updateScript = gnome3.updateScript {
2222 packageName = pname;
23+ versionPolicy = "odd-unstable";
2324 };
2425 };
2526
pkgs/development/libraries/cairomm/1.16.nixnew file+70
@@ -0,0 +1,70 @@
1+{ stdenv
2+, lib
3+, fetchurl
4+, boost
5+, meson
6+, ninja
7+, pkg-config
8+, cairo
9+, fontconfig
10+, libsigcxx30
11+}:
12+
13+stdenv.mkDerivation rec {
14+ pname = "cairomm";
15+ version = "1.16.0";
16+
17+ outputs = [ "out" "dev" ];
18+
19+ src = fetchurl {
20+ url = "https://www.cairographics.org/releases/${pname}-${version}.tar.xz";
21+ sha256 = "1ya4y7qa000cjawqwswbqv26y5icfkmhs5iiiil4dxgrqn91923y";
22+ };
23+
24+ nativeBuildInputs = [
25+ meson
26+ ninja
27+ pkg-config
28+ ];
29+
30+ buildInputs = [
31+ boost # for tests
32+ fontconfig
33+ ];
34+
35+ propagatedBuildInputs = [
36+ cairo
37+ libsigcxx30
38+ ];
39+
40+ mesonFlags = [
41+ "-Dbuild-tests=true"
42+ "-Dboost-shared=true"
43+ ];
44+
45+ # Meson is no longer able to pick up Boost automatically.
46+ # https://github.com/NixOS/nixpkgs/issues/86131
47+ BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
48+ BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
49+
50+ doCheck = true;
51+
52+ meta = with lib; {
53+ description = "A 2D graphics library with support for multiple output devices";
54+ longDescription = ''
55+ Cairo is a 2D graphics library with support for multiple output
56+ devices. Currently supported output targets include the X
57+ Window System, Quartz, Win32, image buffers, PostScript, PDF,
58+ and SVG file output. Experimental backends include OpenGL
59+ (through glitz), XCB, BeOS, OS/2, and DirectFB.
60+
61+ Cairo is designed to produce consistent output on all output
62+ media while taking advantage of display hardware acceleration
63+ when available (e.g., through the X Render Extension).
64+ '';
65+ homepage = "https://www.cairographics.org/";
66+ license = with licenses; [ lgpl2Plus mpl10 ];
67+ maintainers = teams.gnome.members;
68+ platforms = platforms.unix;
69+ };
70+}
pkgs/development/libraries/clutter-gst/default.nix+1
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
1919 passthru = {
2020 updateScript = gnome3.updateScript {
2121 packageName = pname;
22+ versionPolicy = "odd-unstable";
2223 };
2324 };
2425
pkgs/development/libraries/clutter-gtk/default.nix+1
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
2424 passthru = {
2525 updateScript = gnome3.updateScript {
2626 packageName = pname;
27+ versionPolicy = "odd-unstable";
2728 };
2829 };
2930
pkgs/development/libraries/clutter/default.nix+1
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
3131 passthru = {
3232 updateScript = gnome3.updateScript {
3333 packageName = pname;
34+ versionPolicy = "odd-unstable";
3435 };
3536 };
3637
pkgs/development/libraries/cogl/default.nix+1
@@ -61,6 +61,7 @@ in stdenv.mkDerivation rec {
6161 passthru = {
6262 updateScript = gnome3.updateScript {
6363 packageName = pname;
64+ versionPolicy = "odd-unstable";
6465 };
6566 };
6667
pkgs/development/libraries/dconf/default.nix+3−2
@@ -19,14 +19,14 @@ let
1919in
2020stdenv.mkDerivation rec {
2121 pname = "dconf";
22− version = "0.38.0";
22+ version = "0.40.0";
2323
2424 outputs = [ "out" "lib" "dev" ]
2525 ++ lib.optional (!isCross) "devdoc";
2626
2727 src = fetchurl {
2828 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
29− sha256 = "0n2gqkp6d61h7gnnp2xnxp6w5wcl7w9ay58krrf729qd6d0hzxj5";
29+ sha256 = "0cs5nayg080y8pb9b7qccm1ni8wkicdmqp1jsgc22110r6j24zyg";
3030 };
3131
3232 nativeBuildInputs = [
@@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
6363 passthru = {
6464 updateScript = gnome3.updateScript {
6565 packageName = pname;
66+ versionPolicy = "odd-unstable";
6667 };
6768 };
6869
pkgs/development/libraries/folks/default.nix+15−18
@@ -1,7 +1,6 @@
11{ fetchurl
22, lib, stdenv
33, pkg-config
4−, fetchpatch
54, meson
65, ninja
76, glib
@@ -18,6 +17,7 @@
1817, dbus
1918, libgee
2019, evolution-data-server
20+, libgdata
2121, libsecret
2222, db
2323, python3
@@ -34,29 +34,15 @@
3434
3535stdenv.mkDerivation rec {
3636 pname = "folks";
37− version = "0.14.0";
37+ version = "0.15.2";
3838
3939 outputs = [ "out" "dev" "devdoc" ];
4040
4141 src = fetchurl {
4242 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
43− sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn";
43+ sha256 = "08nirjax4m4g4ljr8ksq16wzmrvzq6myqh5rm0dw6pnijqk7nxzg";
4444 };
4545
46− patches = [
47− # Fix tests with e-d-s linked with libphonenumber support
48− # https://gitlab.gnome.org/GNOME/folks/merge_requests/40
49− (fetchpatch {
50− url = "https://gitlab.gnome.org/GNOME/folks/commit/6d443480a137f6a6ff345b21bf3cb31066eefbcd.patch";
51− sha256 = "D/Y2g12TT0qrcH+iJ2umu4Hmp0EJ3Hoedh0H3aWI+HY=";
52− })
53− ];
54−
55− mesonFlags = [
56− "-Ddocs=true"
57− "-Dtelepathy_backend=${lib.boolToString telepathySupport}"
58− ];
59−
6046 nativeBuildInputs = [
6147 gettext
6248 gobject-introspection
@@ -75,6 +61,7 @@ stdenv.mkDerivation rec {
7561 db
7662 dbus-glib
7763 evolution-data-server
64+ libgdata # required for some backends transitively
7865 libsecret
7966 libsoup
8067 libxml2
@@ -100,7 +87,17 @@ stdenv.mkDerivation rec {
10087 ]))
10188 ];
10289
103− doCheck = true;
90+ mesonFlags = [
91+ "-Ddocs=true"
92+ "-Dtelepathy_backend=${lib.boolToString telepathySupport}"
93+ # For some reason, the tests are getting stuck on 31/32,
94+ # even though the one missing test finishes just fine on next run,
95+ # when tests are permuted differently. And another test that
96+ # previously passed will be stuck instead.
97+ "-Dtests=false"
98+ ];
99+
100+ doCheck = false;
104101
105102 # Prevents e-d-s add-contacts-stress-test from timing out
106103 checkPhase = ''
pkgs/development/libraries/gcr/default.nix+3−2
@@ -22,11 +22,11 @@
2222
2323stdenv.mkDerivation rec {
2424 pname = "gcr";
25− version = "3.38.1";
25+ version = "3.40.0";
2626
2727 src = fetchurl {
2828 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
29− sha256 = "F/yvnEqTpl+xxyuCZDuxAsEzRAhGh9WIbqZjE4aNnsk=";
29+ sha256 = "udNkWl/ZU6VChcxk1PwEZzZGPb1NzCXK9ce1m+0wJ/U=";
3030 };
3131
3232 postPatch = ''
@@ -84,6 +84,7 @@ stdenv.mkDerivation rec {
8484 passthru = {
8585 updateScript = gnome3.updateScript {
8686 packageName = pname;
87+ versionPolicy = "odd-unstable";
8788 };
8889 };
8990
pkgs/development/libraries/gdk-pixbuf/default.nix+25−21
@@ -7,11 +7,10 @@
77, pkg-config
88, gettext
99, python3
10−, libxml2
1110, libxslt
1211, docbook-xsl-nons
1312, docbook_xml_dtd_43
14−, gtk-doc
13+, gi-docgen
1514, glib
1615, libtiff
1716, libjpeg
@@ -25,13 +24,13 @@
2524
2625stdenv.mkDerivation rec {
2726 pname = "gdk-pixbuf";
28− version = "2.42.2";
27+ version = "2.42.6";
2928
3029 outputs = [ "out" "dev" "man" "devdoc" "installedTests" ];
3130
3231 src = fetchurl {
3332 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
34− sha256 = "05ggmzwvrxq9w4zcvmrnnd6qplsmb4n95lj4q607c7arzlf6mil3";
33+ sha256 = "0zz7pmw2z46g7mr1yjxbsdldd5pd03xbjc58inj8rxfqgrdvg9n4";
3534 };
3635
3736 patches = [
@@ -45,14 +44,15 @@ stdenv.mkDerivation rec {
4544 pkg-config
4645 gettext
4746 python3
48− libxml2
49− libxslt
50− docbook-xsl-nons
51− docbook_xml_dtd_43
52− gtk-doc
5347 gobject-introspection
5448 makeWrapper
5549 glib
50+ gi-docgen
51+
52+ # for man pages
53+ libxslt
54+ docbook-xsl-nons
55+ docbook_xml_dtd_43
5656 ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
5757
5858 propagatedBuildInputs = [
@@ -75,19 +75,26 @@ stdenv.mkDerivation rec {
7575 substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests"
7676 '';
7777
78+ preInstall = ''
79+ PATH=$PATH:$out/bin # for install script
80+ '';
81+
7882 postInstall =
79− # meson erroneously installs loaders with .dylib extension on Darwin.
80− # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them.
81− lib.optionalString stdenv.isDarwin ''
83+ ''
84+ # All except one utility seem to be only useful during building.
85+ moveToOutput "bin" "$dev"
86+ moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
87+
88+ # So that devhelp can find this.
89+ mkdir -p "$devdoc/share/devhelp"
90+ mv "$out/share/doc" "$devdoc/share/devhelp/books"
91+ '' + lib.optionalString stdenv.isDarwin ''
92+ # meson erroneously installs loaders with .dylib extension on Darwin.
93+ # Their @rpath has to be replaced before gdk-pixbuf-query-loaders looks at them.
8294 for f in $out/${passthru.moduleDir}/*.dylib; do
8395 install_name_tool -change @rpath/libgdk_pixbuf-2.0.0.dylib $out/lib/libgdk_pixbuf-2.0.0.dylib $f
8496 mv $f ''${f%.dylib}.so
8597 done
86− ''
87− # All except one utility seem to be only useful during building.
88− + ''
89− moveToOutput "bin" "$dev"
90− moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out"
9198 '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
9299 # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/
93100 $dev/bin/gdk-pixbuf-query-loaders --update-cache
@@ -100,10 +107,6 @@ stdenv.mkDerivation rec {
100107 done
101108 '';
102109
103− preInstall = ''
104− PATH=$PATH:$out/bin # for install script
105− '';
106−
107110 # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
108111 inherit doCheck;
109112
@@ -114,6 +117,7 @@ stdenv.mkDerivation rec {
114117 passthru = {
115118 updateScript = gnome3.updateScript {
116119 packageName = pname;
120+ versionPolicy = "odd-unstable";
117121 };
118122
119123 tests = {
pkgs/development/libraries/gegl/4.0.nix+6−5
@@ -1,4 +1,5 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchurl
34, pkg-config
45, vala
@@ -35,14 +36,14 @@
3536
3637stdenv.mkDerivation rec {
3738 pname = "gegl";
38− version = "0.4.28";
39+ version = "0.4.30";
3940
4041 outputs = [ "out" "dev" "devdoc" ];
4142 outputBin = "dev";
4243
4344 src = fetchurl {
4445 url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
45− sha256 = "sha256-HRENhXfVTMo7NCOTFb03xXzLJ91DVWVQdKLSs/2JeQA=";
46+ sha256 = "sha256-wRJ4LPQJaWniMhfM36vkIoTjXVQ1/wxD1A5McPrsqN0=";
4647 };
4748
4849 nativeBuildInputs = [
@@ -103,8 +104,8 @@ stdenv.mkDerivation rec {
103104 NIX_CFLAGS_COMPILE = "-lm";
104105
105106 postPatch = ''
106− chmod +x tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh
107− patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tests/buffer/buffer-tests-run.sh tools/xml_insert.sh
107+ chmod +x tests/opencl/opencl_test.sh
108+ patchShebangs tests/ff-load-save/tests_ff_load_save.sh tests/opencl/opencl_test.sh tools/xml_insert.sh
108109 '';
109110
110111 # tests fail to connect to the com.apple.fonts daemon in sandboxed mode
pkgs/development/libraries/gexiv2/default.nix+1
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
2424 passthru = {
2525 updateScript = gnome3.updateScript {
2626 packageName = pname;
27+ versionPolicy = "odd-unstable";
2728 };
2829 };
2930
pkgs/development/libraries/gfbgraph/default.nix+1
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
3737 passthru = {
3838 updateScript = gnome3.updateScript {
3939 packageName = pname;
40+ versionPolicy = "odd-unstable";
4041 };
4142 };
4243
pkgs/development/libraries/gjs/default.nix+16−14
@@ -1,6 +1,6 @@
11{ fetchurl
2−, fetchpatch
3−, lib, stdenv
2+, lib
3+, stdenv
44, meson
55, ninja
66, pkg-config
@@ -16,6 +16,7 @@
1616, libxml2
1717, dbus
1818, gdk-pixbuf
19+, harfbuzz
1920, makeWrapper
2021, which
2122, xvfb_run
@@ -25,18 +26,26 @@
2526let
2627 testDeps = [
2728 gobject-introspection # for Gio and cairo typelibs
28− gtk3 atk pango.out gdk-pixbuf
29+ gtk3 atk pango.out gdk-pixbuf harfbuzz
2930 ];
3031in stdenv.mkDerivation rec {
3132 pname = "gjs";
32− version = "1.66.2";
33+ version = "1.68.1";
34+
35+ outputs = [ "out" "dev" "installedTests" ];
3336
3437 src = fetchurl {
3538 url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
36− sha256 = "vX9fixcSd8wLue4XVLAkC2Lwana4sYyWjPRxs0qzTlk=";
39+ sha256 = "0w2cbfpmc6alz7z8ycchhlkn586av5y8zk2xmgwzq10i0k13xyig";
3740 };
3841
39− outputs = [ "out" "dev" "installedTests" ];
42+ patches = [
43+ # Hard-code various paths
44+ ./fix-paths.patch
45+
46+ # Allow installing installed tests to a separate output.
47+ ./installed-tests-path.patch
48+ ];
4049
4150 nativeBuildInputs = [
4251 meson
@@ -68,14 +77,6 @@ in stdenv.mkDerivation rec {
6877 "-Dinstalled_test_prefix=${placeholder "installedTests"}"
6978 ];
7079
71− patches = [
72− # Hard-code various paths
73− ./fix-paths.patch
74−
75− # Allow installing installed tests to a separate output.
76− ./installed-tests-path.patch
77− ];
78−
7980 doCheck = true;
8081
8182 postPatch = ''
@@ -91,6 +92,7 @@ in stdenv.mkDerivation rec {
9192 mkdir -p $out/lib $installedTests/libexec/installed-tests/gjs
9293 ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0
9394 ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/installed-tests/gjs/libgimarshallingtests.so
95+ ln -s $PWD/installed-tests/js/libgjstesttools/libgjstesttools.so $installedTests/libexec/installed-tests/gjs/libgjstesttools.so
9496 ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/installed-tests/gjs/libregress.so
9597 ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/installed-tests/gjs/libwarnlib.so
9698 '';
pkgs/development/libraries/glib-networking/default.nix+3−2
@@ -18,13 +18,13 @@
1818
1919stdenv.mkDerivation rec {
2020 pname = "glib-networking";
21− version = "2.66.0";
21+ version = "2.68.1";
2222
2323 outputs = [ "out" "installedTests" ];
2424
2525 src = fetchurl {
2626 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
27− sha256 = "16807qwflbghp0c66jdx2gnaffvdp4bla35ppzp9dlgx6wjbxmy5";
27+ sha256 = "0c1vylxly8k7g454g02spi44ybjidlwg461vp713zxd94k8qnpfh";
2828 };
2929
3030 patches = [
@@ -76,6 +76,7 @@ stdenv.mkDerivation rec {
7676 passthru = {
7777 updateScript = gnome3.updateScript {
7878 packageName = pname;
79+ versionPolicy = "odd-unstable";
7980 };
8081
8182 tests = {
pkgs/development/libraries/glib/default.nix+2−2
@@ -45,11 +45,11 @@ in
4545
4646stdenv.mkDerivation rec {
4747 pname = "glib";
48− version = "2.66.8";
48+ version = "2.68.1";
4949
5050 src = fetchurl {
5151 url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
52− sha256 = "sha256-l7yH3ZE2VYmvXLv+oldIM66nobcYQP02Xs0oUsdrnIs=";
52+ sha256 = "sha256-JBZUuWvTa4iqoSgU78SEO1eOVdR0QBA3J5Waw0aUQzM=";
5353 };
5454
5555 patches = optionals stdenv.isDarwin [
pkgs/development/libraries/glibmm/2.68.nixnew file+59
@@ -0,0 +1,59 @@
1+{ lib
2+, stdenv
3+, fetchurl
4+, pkg-config
5+, gnum4
6+, glib
7+, libsigcxx30
8+, gnome3
9+, Cocoa
10+, meson
11+, ninja
12+}:
13+
14+stdenv.mkDerivation rec {
15+ pname = "glibmm";
16+ version = "2.68.0";
17+
18+ outputs = [ "out" "dev" ];
19+
20+ src = fetchurl {
21+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
22+ sha256 = "sha256-wfOFcxkdzu2FoFYAiIz0z0aVlB8zlxW9Z9UcJBb083U=";
23+ };
24+
25+ nativeBuildInputs = [
26+ meson
27+ pkg-config
28+ ninja
29+ gnum4
30+ glib # for glib-compile-schemas
31+ ];
32+
33+ buildInputs = lib.optionals stdenv.isDarwin [
34+ Cocoa
35+ ];
36+
37+ propagatedBuildInputs = [
38+ glib
39+ libsigcxx30
40+ ];
41+
42+ doCheck = false; # fails. one test needs the net, another /etc/fstab
43+
44+ passthru = {
45+ updateScript = gnome3.updateScript {
46+ packageName = pname;
47+ attrPath = "glibmm_2_68";
48+ versionPolicy = "odd-unstable";
49+ };
50+ };
51+
52+ meta = with lib; {
53+ description = "C++ interface to the GLib library";
54+ homepage = "https://gtkmm.org/";
55+ license = licenses.lgpl2Plus;
56+ maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]);
57+ platforms = platforms.unix;
58+ };
59+}
pkgs/development/libraries/glibmm/default.nix+1
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
3131 passthru = {
3232 updateScript = gnome3.updateScript {
3333 packageName = pname;
34+ versionPolicy = "odd-unstable";
3435 };
3536 };
3637
pkgs/development/libraries/gnome-online-accounts/default.nix+2−3
@@ -30,7 +30,7 @@
3030
3131stdenv.mkDerivation rec {
3232 pname = "gnome-online-accounts";
33− version = "3.38.1";
33+ version = "3.40.0";
3434
3535 # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87
3636 src = fetchFromGitLab {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 owner = "GNOME";
3939 repo = "gnome-online-accounts";
4040 rev = version;
41− sha256 = "sha256-th7P++MC3GXX+349PJFEwHGGeMhxsGgoEDGnSYpY7E4=";
41+ sha256 = "sha256-GuUWypfmfbovpDKnj6wSBuNeKJIfIyipY+01u/p4znU=";
4242 };
4343
4444 outputs = [ "out" "man" "dev" "devdoc" ];
@@ -46,7 +46,6 @@ stdenv.mkDerivation rec {
4646 mesonFlags = [
4747 "-Dfedora=false" # not useful in NixOS or for NixOS users.
4848 "-Dgtk_doc=true"
49− "-Dlastfm=true"
5049 "-Dman=true"
5150 "-Dmedia_server=true"
5251 ];
pkgs/development/libraries/gobject-introspection/absolute_gir_path.patch+4−2
@@ -1,8 +1,10 @@
1+diff --git a/gir/cairo-1.0.gir.in b/gir/cairo-1.0.gir.in
2+index e4c9fb3d..3351b184 100644
13--- a/gir/cairo-1.0.gir.in
24+++ b/gir/cairo-1.0.gir.in
3−@@ -5,7 +5,7 @@
4− xmlns:glib="http://www.gtk.org/introspection/glib/1.0">
5+@@ -6,7 +6,7 @@
56 <package name="@CAIRO_GIR_PACKAGE@"/>
7+ <c:include name="cairo-gobject.h"/>
68 <namespace name="cairo" version="1.0"
79- shared-library="@CAIRO_SHARED_LIBRARY@"
810+ shared-library="@cairoLib@/@CAIRO_SHARED_LIBRARY@"
pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch+7−8
@@ -40,7 +40,7 @@
4040 def _get_option_parser():
4141 parser = optparse.OptionParser('%prog [options] sources',
4242 version='%prog ' + giscanner.__version__)
43−@@ -205,6 +238,10 @@ match the namespace prefix.""")
43+@@ -214,6 +247,10 @@ match the namespace prefix.""")
4444 parser.add_option("", "--filelist",
4545 action="store", dest="filelist", default=[],
4646 help="file containing headers and sources to be scanned")
@@ -66,7 +66,7 @@
6666 # This is a what we do for non-la files. We assume that we are on an
6767 # ELF-like system where ldd exists and the soname extracted with ldd is
6868 # a filename that can be opened with dlopen().
69−@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries):
69+@@ -108,7 +114,8 @@ def _resolve_non_libtool(options, binary, libraries):
7070 output = output.decode("utf-8", "replace")
7171
7272 shlibs = resolve_from_ldd_output(libraries, output)
@@ -76,7 +76,7 @@
7676
7777
7878 def sanitize_shlib_path(lib):
79−@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib):
79+@@ -117,19 +124,18 @@ def sanitize_shlib_path(lib):
8080 # In case we get relative paths on macOS (like @rpath) then we fall
8181 # back to the basename as well:
8282 # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
@@ -101,7 +101,7 @@
101101 if len(patterns) == 0:
102102 return []
103103
104−@@ -139,8 +145,11 @@ def resolve_from_ldd_output(libraries, output):
104+@@ -141,8 +147,11 @@ def resolve_from_ldd_output(libraries, output):
105105 if line.endswith(':'):
106106 continue
107107 for word in line.split():
@@ -117,7 +117,7 @@
117117 shlibs.append(m.group())
118118--- a/giscanner/utils.py
119119+++ b/giscanner/utils.py
120−@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file):
120+@@ -113,16 +113,11 @@ def extract_libtool_shlib(la_file):
121121 if dlname is None:
122122 return None
123123
@@ -129,8 +129,7 @@
129129- if libdir is None:
130130- return dlbasename
131131- return libdir + '/' + dlbasename
132−- # From the comments in extract_libtool(), older libtools had
133−- # a path rather than the raw dlname
132+- # Older libtools had a path rather than the raw dlname
134133- return os.path.basename(dlname)
135134+ dlbasename = os.path.basename(dlname)
136135+ libdir = _extract_libdir_field(la_file)
@@ -139,7 +138,7 @@
139138+ return libdir + '/' + dlbasename
140139
141140
142− def extract_libtool(la_file):
141+ # Returns arguments for invoking libtool, if applicable, otherwise None
143142--- a/tests/scanner/test_shlibs.py
144143+++ b/tests/scanner/test_shlibs.py
145144@@ -7,6 +7,30 @@ from giscanner.shlibs import resolve_from_ldd_output, sanitize_shlib_path
pkgs/development/libraries/gobject-introspection/default.nix+3−2
@@ -26,7 +26,7 @@
2626
2727stdenv.mkDerivation rec {
2828 pname = "gobject-introspection";
29− version = "1.66.1";
29+ version = "1.68.0";
3030
3131 # outputs TODO: share/gobject-introspection-1.0/tests is needed during build
3232 # by pygobject3 (and maybe others), but it's only searched in $out
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
3535
3636 src = fetchurl {
3737 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
38− sha256 = "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x";
38+ sha256 = "09sawnv3xj9pzgy2qrrk87dl3jibfphnswb61i5bh0d2h4j28afj";
3939 };
4040
4141 patches = [
@@ -114,6 +114,7 @@ stdenv.mkDerivation rec {
114114 passthru = {
115115 updateScript = gnome3.updateScript {
116116 packageName = pname;
117+ versionPolicy = "odd-unstable";
117118 };
118119 };
119120
pkgs/development/libraries/goffice/default.nix+1
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
2626 passthru = {
2727 updateScript = gnome3.updateScript {
2828 packageName = pname;
29+ versionPolicy = "odd-unstable";
2930 };
3031 };
3132
pkgs/development/libraries/gom/default.nix+1
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
5050 passthru = {
5151 updateScript = gnome3.updateScript {
5252 packageName = pname;
53+ versionPolicy = "odd-unstable";
5354 };
5455 };
5556
pkgs/development/libraries/goocanvasmm/default.nix+1
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
1919 updateScript = gnome3.updateScript {
2020 packageName = pname;
2121 attrPath = "goocanvasmm2";
22+ versionPolicy = "odd-unstable";
2223 };
2324 };
2425
pkgs/development/libraries/grilo-plugins/default.nix+2−2
@@ -31,11 +31,11 @@
3131
3232stdenv.mkDerivation rec {
3333 pname = "grilo-plugins";
34− version = "0.3.12";
34+ version = "0.3.13";
3535
3636 src = fetchurl {
3737 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
38− sha256 = "0xr59gzb8gw2bgj14mjllgn8y7srh373j0fp0v16ak8nd84dzdn6";
38+ sha256 = "HEMF1nNkqTBUODbMGYLzDpRpc7j/avPv4x2HcJq1IPg=";
3939 };
4040
4141 patches = [
pkgs/development/libraries/gsettings-desktop-schemas/default.nix+3−3
@@ -12,11 +12,11 @@
1212
1313stdenv.mkDerivation rec {
1414 pname = "gsettings-desktop-schemas";
15− version = "3.38.0";
15+ version = "40.0";
1616
1717 src = fetchurl {
18− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
19− sha256 = "0rwcg9sd5rv7gjwapcd1jjk6l16w0p3j7wkicq1rdch4c0kch12p";
18+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
19+ sha256 = "11an29br55dp0b26kfqlrfxj19glfrmhcdpds2n1w9n04gq3pf7i";
2020 };
2121
2222 nativeBuildInputs = [
pkgs/development/libraries/gsound/default.nix+1
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
1515 passthru = {
1616 updateScript = gnome3.updateScript {
1717 packageName = pname;
18+ versionPolicy = "odd-unstable";
1819 };
1920 };
2021
pkgs/development/libraries/gstreamer/bad/default.nix+10
@@ -1,6 +1,7 @@
11{ lib
22, stdenv
33, fetchurl
4+, fetchpatch
45, meson
56, ninja
67, gettext
@@ -103,6 +104,15 @@ stdenv.mkDerivation rec {
103104 patches = [
104105 # Use pkgconfig to inject the includedirs
105106 ./fix_pkgconfig_includedir.patch
107+ ] ++ lib.optionals stdenv.isDarwin [
108+ # Fix “error: cannot initialize a parameter of type 'unsigned long *' with an rvalue of type 'typename std::remove_reference<decltype(*(&opencv_dilate_erode_type))>::type *' (aka 'volatile unsigned long *')” on Darwin.
109+ (fetchpatch {
110+ url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/640a65bf966df065d41a511e2d76d1f26a2e770c.patch";
111+ sha256 = "E5pig+qEfR58Jticr6ydFxZOhM3ZJ8zgrf5K4BdiB/Y=";
112+ includes = [
113+ "ext/opencv/gstcvdilateerode.cpp"
114+ ];
115+ })
106116 ];
107117
108118 nativeBuildInputs = [
pkgs/development/libraries/gstreamer/gstreamermm/default.nix+2−2
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
1818
1919 passthru = {
2020 updateScript = gnome3.updateScript {
21− packageName = pname;
22− versionPolicy = "none"; # Unpredictable version stability
21+ packageName = "gst_all_1.gstreamermm";
22+ versionPolicy = "odd-unstable";
2323 };
2424 };
2525
pkgs/development/libraries/gtk/4.x.nix+30−29
@@ -5,9 +5,7 @@
55, pkg-config
66, gettext
77, graphene
8−, docbook-xsl-nons
9−, docbook_xml_dtd_43
10−, gtk-doc
8+, gi-docgen
119, meson
1210, ninja
1311, python3
@@ -45,7 +43,6 @@
4543, wayland-protocols
4644, xineramaSupport ? stdenv.isLinux
4745, cupsSupport ? stdenv.isLinux
48−, withGtkDoc ? stdenv.isLinux
4946, cups
5047, AppKit
5148, Cocoa
@@ -64,9 +61,9 @@ in
6461
6562stdenv.mkDerivation rec {
6663 pname = "gtk4";
67− version = "4.0.3";
64+ version = "4.2.1";
6865
69− outputs = [ "out" "dev" ] ++ lib.optional withGtkDoc "devdoc";
66+ outputs = [ "out" "dev" ] ++ lib.optionals x11Support [ "devdoc" ];
7067 outputBin = "dev";
7168
7269 setupHooks = [
@@ -76,7 +73,7 @@ stdenv.mkDerivation rec {
7673
7774 src = fetchurl {
7875 url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
79− sha256 = "18mJNyV5C1C9mjuyeIVtnVQ7RLa5uVHXtg573swTGJA=";
76+ sha256 = "AjFpd13kPwof3gZvvBnXhUXqanViwZFavem4rkpzCeY=";
8077 };
8178
8279 nativeBuildInputs = [
@@ -88,21 +85,17 @@ stdenv.mkDerivation rec {
8885 pkg-config
8986 python3
9087 sassc
91− ] ++ setupHooks ++ lib.optionals withGtkDoc [
92− pandoc
93− docbook_xml_dtd_43
94− docbook-xsl-nons
95− gtk-doc
96− # For xmllint
97− libxml2
98− ];
88+ gi-docgen
89+ ] ++ setupHooks;
9990
10091 buildInputs = [
10192 libxkbcommon
10293 epoxy
10394 json-glib
10495 isocodes
96+ ] ++ lib.optionals (!stdenv.isDarwin) [
10597 vulkan-headers
98+ ] ++ [
10699 librest
107100 libsoup
108101 ffmpeg
@@ -141,18 +134,27 @@ stdenv.mkDerivation rec {
141134 glib
142135 graphene
143136 pango
144− vulkan-loader # TODO: Possibly not used on Darwin
145−
137+ ] ++ lib.optionals (!stdenv.isDarwin) [
138+ vulkan-loader
139+ ] ++ [
146140 # Required for GSettings schemas at runtime.
147141 # Will be picked up by wrapGAppsHook.
148142 gsettings-desktop-schemas
149143 ];
150144
151145 mesonFlags = [
152− "-Dgtk_doc=${lib.boolToString withGtkDoc}"
153− "-Dtests=false"
154− "-Dtracker3=${lib.boolToString trackerSupport}"
155− "-Dbroadway_backend=${lib.boolToString broadwaySupport}"
146+ # ../docs/tools/shooter.c:4:10: fatal error: 'cairo-xlib.h' file not found
147+ "-Dgtk_doc=${lib.boolToString x11Support}"
148+ "-Dbuild-tests=false"
149+ "-Dtracker=${if trackerSupport then "enabled" else "disabled"}"
150+ "-Dbroadway-backend=${lib.boolToString broadwaySupport}"
151+ ] ++ lib.optionals (!cupsSupport) [
152+ "-Dprint-cups=disabled"
153+ ] ++ lib.optionals stdenv.isDarwin [
154+ "-Dvulkan=disabled"
155+ "-Dmedia-gstreamer=disabled" # requires gstreamer-gl
156+ ] ++ lib.optionals (!x11Support) [
157+ "-Dx11-backend=false"
156158 ];
157159
158160 doCheck = false; # needs X11
@@ -171,20 +173,12 @@ stdenv.mkDerivation rec {
171173 gdk/gen-gdk-gresources-xml.py
172174 gtk/gen-gtk-gresources-xml.py
173175 gtk/gentypefuncs.py
174− docs/reference/gtk/gtk-markdown-to-docbook
175176 )
176177
177178 chmod +x ''${files[@]}
178179 patchShebangs ''${files[@]}
179180 '';
180181
181− postBuild = lib.optionalString withGtkDoc ''
182− # Meson not building `custom_target`s passed to `custom_files` argument of `gnome.gtkdoc` function
183− # as part of the `install` target. We have to build the docs manually first.
184− # https://github.com/mesonbuild/meson/issues/2831
185− ninja g{t,d,s}k4-doc
186− '';
187−
188182 preInstall = ''
189183 OLD_PATH="$PATH"
190184 PATH="$PATH:$dev/bin" # so the install script finds gtk4-update-icon-cache
@@ -202,6 +196,13 @@ stdenv.mkDerivation rec {
202196 for f in $dev/bin/gtk4-encode-symbolic-svg; do
203197 wrapProgram $f --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
204198 done
199+
200+ '' + lib.optionalString x11Support ''
201+ # So that DevHelp can find this.
202+ # TODO: Remove this with DevHelp 41.
203+ mkdir -p "$devdoc/share/devhelp/books"
204+ mv "$out/share/doc/"* "$devdoc/share/devhelp/books"
205+ rmdir -p --ignore-fail-on-non-empty "$out/share/doc"
205206 '';
206207
207208 # Wrap demos
pkgs/development/libraries/gtkmm/3.x.nix+3−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "gtkmm";
5− version = "3.24.3";
5+ version = "3.24.4";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "sha256-YEl8T381TDvSVXSF8CVPi3tM9L68n+4L4mp3dE6s1DU=";
9+ sha256 = "sha256-m+txw+kM/Pt5A5a1Hj9ecWmWZ1Hv1PPvlpcRS+O+Z0M=";
1010 };
1111
1212 outputs = [ "out" "dev" ];
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
2525 updateScript = gnome3.updateScript {
2626 packageName = pname;
2727 attrPath = "${pname}3";
28+ versionPolicy = "odd-unstable";
2829 };
2930 };
3031
pkgs/development/libraries/gtkmm/4.x.nixnew file+91
@@ -0,0 +1,91 @@
1+{ stdenv
2+, lib
3+, fetchurl
4+, pkg-config
5+, meson
6+, ninja
7+, python3
8+, gtk4
9+, glibmm_2_68
10+, cairomm_1_16
11+, pangomm_2_48
12+, epoxy
13+, gnome3
14+, makeFontsConf
15+, xvfb_run
16+}:
17+
18+stdenv.mkDerivation rec {
19+ pname = "gtkmm";
20+ version = "4.0.1";
21+
22+ outputs = [ "out" "dev" ];
23+
24+ src = fetchurl {
25+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
26+ sha256 = "sha256-iXPZvHhI4CyyBR4F8+46S6/+L+tK9KVIfw4xMu7AOIQ=";
27+ };
28+
29+ nativeBuildInputs = [
30+ pkg-config
31+ meson
32+ ninja
33+ python3
34+ ];
35+
36+ buildInputs = [
37+ epoxy
38+ ];
39+
40+ propagatedBuildInputs = [
41+ glibmm_2_68
42+ gtk4
43+ cairomm_1_16
44+ pangomm_2_48
45+ ];
46+
47+ checkInputs = [
48+ xvfb_run
49+ ];
50+
51+ # Tests require fontconfig.
52+ FONTCONFIG_FILE = makeFontsConf {
53+ fontDirectories = [ ];
54+ };
55+
56+ doCheck = true;
57+
58+ checkPhase = ''
59+ runHook preCheck
60+
61+ xvfb-run -s '-screen 0 800x600x24' \
62+ meson test --print-errorlogs
63+
64+ runHook postCheck
65+ '';
66+
67+ passthru = {
68+ updateScript = gnome3.updateScript {
69+ packageName = pname;
70+ attrPath = "${pname}4";
71+ versionPolicy = "odd-unstable";
72+ };
73+ };
74+
75+ meta = with lib; {
76+ description = "C++ interface to the GTK graphical user interface library";
77+ longDescription = ''
78+ gtkmm is the official C++ interface for the popular GUI library
79+ GTK. Highlights include typesafe callbacks, and a
80+ comprehensive set of widgets that are easily extensible via
81+ inheritance. You can create user interfaces either in code or
82+ with the Glade User Interface designer, using libglademm.
83+ There's extensive documentation, including API reference and a
84+ tutorial.
85+ '';
86+ homepage = "https://gtkmm.org/";
87+ license = licenses.lgpl2Plus;
88+ maintainers = teams.gnome.members ++ (with maintainers; [ raskin vcunat ]);
89+ platforms = platforms.unix;
90+ };
91+}
pkgs/development/libraries/gtksourceview/4.x.nix+67−21
@@ -1,32 +1,42 @@
1−{ lib, stdenv, fetchurl, fetchpatch, pkg-config, atk, cairo, glib, gtk3, pango, fribidi, vala
2−, libxml2, perl, gettext, gnome3, gobject-introspection, dbus, xvfb_run, shared-mime-info
3−, meson, ninja }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, fetchpatch
5+, meson
6+, ninja
7+, pkg-config
8+, atk
9+, cairo
10+, glib
11+, gtk3
12+, pango
13+, fribidi
14+, vala
15+, libxml2
16+, perl
17+, gettext
18+, gnome3
19+, gobject-introspection
20+, dbus
21+, xvfb_run
22+, shared-mime-info
23+}:
424
525stdenv.mkDerivation rec {
626 pname = "gtksourceview";
727 version = "4.8.1";
828
29+ outputs = [ "out" "dev" ];
30+
931 src = fetchurl {
1032 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
1133 sha256 = "0WPXG1/K+8Wx7sbdhB7b283dOnURzV/c/9hri7/mmsE=";
1234 };
1335
14− propagatedBuildInputs = [
15− # Required by gtksourceview-4.0.pc
16− gtk3
17− # Used by gtk_source_language_manager_guess_language
18− shared-mime-info
19− ];
20−
21− outputs = [ "out" "dev" ];
22−
23− nativeBuildInputs = [ meson ninja pkg-config gettext perl gobject-introspection vala ];
24−
25− checkInputs = [ xvfb_run dbus ];
26−
27− buildInputs = [ atk cairo glib pango fribidi libxml2 ];
28−
2936 patches = [
37+ # By default, the library loads syntaxes from XDG_DATA_DIRS and user directory
38+ # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS).
39+ # Since this is not generally true with Nix, let’s add $out/share unconditionally.
3040 ./4.x-nix_share_path.patch
3141
3242 # fixes intermittent "gtksourceview-gresources.h: no such file" errors
@@ -37,27 +47,63 @@ stdenv.mkDerivation rec {
3747 })
3848 ];
3949
40− enableParallelBuilding = true;
50+ nativeBuildInputs = [
51+ meson
52+ ninja
53+ pkg-config
54+ gettext
55+ perl
56+ gobject-introspection
57+ vala
58+ ];
59+
60+ buildInputs = [
61+ atk
62+ cairo
63+ glib
64+ pango
65+ fribidi
66+ libxml2
67+ ];
68+
69+ propagatedBuildInputs = [
70+ # Required by gtksourceview-4.0.pc
71+ gtk3
72+ # Used by gtk_source_language_manager_guess_language
73+ shared-mime-info
74+ ];
75+
76+ checkInputs = [
77+ xvfb_run
78+ dbus
79+ ];
4180
4281 doCheck = stdenv.isLinux;
82+
4383 checkPhase = ''
84+ runHook preCheck
85+
4486 XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
4587 xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
4688 --config-file=${dbus.daemon}/share/dbus-1/session.conf \
4789 meson test --no-rebuild --print-errorlogs
90+
91+ runHook postCheck
4892 '';
4993
5094 passthru = {
5195 updateScript = gnome3.updateScript {
5296 packageName = "gtksourceview";
5397 attrPath = "gtksourceview4";
98+ versionPolicy = "odd-unstable";
5499 };
55100 };
56101
57102 meta = with lib; {
103+ description = "Source code editing widget for GTK";
58104 homepage = "https://wiki.gnome.org/Projects/GtkSourceView";
59− platforms = with platforms; linux ++ darwin;
60− license = licenses.lgpl21;
105+ platforms = platforms.unix;
106+ license = licenses.lgpl21Plus;
61107 maintainers = teams.gnome.members;
62108 };
63109}
pkgs/development/libraries/gtksourceview/5.x.nixnew file+99
@@ -0,0 +1,99 @@
1+{ lib
2+, stdenv
3+, fetchurl
4+, meson
5+, ninja
6+, pkg-config
7+, glib
8+, pcre2
9+, gtk4
10+, pango
11+, fribidi
12+, vala
13+, libxml2
14+, perl
15+, gettext
16+, gnome3
17+, gobject-introspection
18+, dbus
19+, xvfb_run
20+, shared-mime-info
21+}:
22+
23+stdenv.mkDerivation rec {
24+ pname = "gtksourceview";
25+ version = "5.0.0";
26+
27+ outputs = [ "out" "dev" ];
28+
29+ src = fetchurl {
30+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
31+ sha256 = "1hyrmh9r1zd5kjh5ch9d7bhk2kphbqhm7ijfxfkcdln8q0rnd0k4";
32+ };
33+
34+ patches = [
35+ # By default, the library loads syntaxes from XDG_DATA_DIRS and user directory
36+ # but not from its own datadr (it assumes it will be in XDG_DATA_DIRS).
37+ # Since this is not generally true with Nix, let’s add $out/share unconditionally.
38+ ./4.x-nix_share_path.patch
39+ ];
40+
41+ nativeBuildInputs = [
42+ meson
43+ ninja
44+ pkg-config
45+ gettext
46+ perl
47+ gobject-introspection
48+ vala
49+ ];
50+
51+ buildInputs = [
52+ glib
53+ pcre2
54+ pango
55+ fribidi
56+ libxml2
57+ ];
58+
59+ propagatedBuildInputs = [
60+ # Required by gtksourceview-5.0.pc
61+ gtk4
62+ # Used by gtk_source_language_manager_guess_language
63+ shared-mime-info
64+ ];
65+
66+ checkInputs = [
67+ xvfb_run
68+ dbus
69+ ];
70+
71+ doCheck = stdenv.isLinux;
72+
73+ checkPhase = ''
74+ runHook preCheck
75+
76+ XDG_DATA_DIRS="$XDG_DATA_DIRS:${shared-mime-info}/share" \
77+ xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
78+ --config-file=${dbus.daemon}/share/dbus-1/session.conf \
79+ meson test --no-rebuild --print-errorlogs
80+
81+ runHook postCheck
82+ '';
83+
84+ passthru = {
85+ updateScript = gnome3.updateScript {
86+ packageName = "gtksourceview";
87+ attrPath = "gtksourceview5";
88+ versionPolicy = "odd-unstable";
89+ };
90+ };
91+
92+ meta = with lib; {
93+ description = "Source code editing widget for GTK";
94+ homepage = "https://wiki.gnome.org/Projects/GtkSourceView";
95+ platforms = platforms.unix;
96+ license = licenses.lgpl21Plus;
97+ maintainers = teams.gnome.members;
98+ };
99+}
pkgs/development/libraries/gupnp-av/default.nix+1
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
4545 passthru = {
4646 updateScript = gnome3.updateScript {
4747 packageName = pname;
48+ versionPolicy = "odd-unstable";
4849 };
4950 };
5051
pkgs/development/libraries/gupnp-dlna/default.nix+1
@@ -50,6 +50,7 @@ stdenv.mkDerivation rec {
5050 passthru = {
5151 updateScript = gnome3.updateScript {
5252 packageName = pname;
53+ versionPolicy = "odd-unstable";
5354 };
5455 };
5556
pkgs/development/libraries/gupnp-igd/default.nix+1
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
5151 passthru = {
5252 updateScript = gnome3.updateScript {
5353 packageName = pname;
54+ versionPolicy = "odd-unstable";
5455 };
5556 };
5657
pkgs/development/libraries/gvfs/default.nix+3−2
@@ -41,11 +41,11 @@
4141
4242stdenv.mkDerivation rec {
4343 pname = "gvfs";
44− version = "1.46.2";
44+ version = "1.48.1";
4545
4646 src = fetchurl {
4747 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
48− sha256 = "2D+hYChmcMA+uJAkBgbYr6fqajqBjorRfu7Y2XZIe9c=";
48+ sha256 = "1hlxl6368h6nyqp1888szxs9hnpcw98k3h23dgqi29xd38klzsmj";
4949 };
5050
5151 postPatch = ''
@@ -119,6 +119,7 @@ stdenv.mkDerivation rec {
119119 passthru = {
120120 updateScript = gnome3.updateScript {
121121 packageName = pname;
122+ versionPolicy = "odd-unstable";
122123 };
123124 };
124125
pkgs/development/libraries/json-glib/default.nix+1
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
4848 passthru = {
4949 updateScript = gnome3.updateScript {
5050 packageName = pname;
51+ versionPolicy = "odd-unstable";
5152 };
5253 };
5354
pkgs/development/libraries/jsonrpc-glib/default.nix+1
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
2424 passthru = {
2525 updateScript = gnome3.updateScript {
2626 packageName = pname;
27+ versionPolicy = "odd-unstable";
2728 };
2829 };
2930
pkgs/development/libraries/lasem/default.nix+1
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
2424 passthru = {
2525 updateScript = gnome3.updateScript {
2626 packageName = pname;
27+ versionPolicy = "odd-unstable";
2728 };
2829 };
2930
pkgs/development/libraries/libblockdev/default.nix+8−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkg-config, gtk-doc
1+{ lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, autoreconfHook, pkg-config, gtk-doc
22, docbook_xml_dtd_43, python3, gobject-introspection, glib, udev, kmod, parted
33, cryptsetup, lvm2, dmraid, util-linux, libbytesize, libndctl, nss, volume_key
44, libxslt, docbook_xsl, gptfdisk, libyaml, autoconf-archive
@@ -22,6 +22,13 @@ stdenv.mkDerivation rec {
2222 src = ./fix-paths.patch;
2323 sgdisk = "${gptfdisk}/bin/sgdisk";
2424 })
25+
26+ # fix build with glib 2.68 (g_memdup is deprecated)
27+ # https://github.com/storaged-project/libblockdev/pull/623
28+ (fetchpatch {
29+ url = "https://github.com/storaged-project/libblockdev/commit/5528baef6ccc835a06c45f9db34a2c9c3f2dd940.patch";
30+ sha256 = "jxq4BLeyTMeNvBvY8k8QXIvYSJ2Gah0J75pq6FpG7PM=";
31+ })
2532 ];
2633
2734 postPatch = ''
pkgs/development/libraries/libchamplain/default.nix+1
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
2626 passthru = {
2727 updateScript = gnome3.updateScript {
2828 packageName = pname;
29+ versionPolicy = "odd-unstable";
2930 };
3031 };
3132
pkgs/development/libraries/libcryptui/default.nix+1
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
2222 passthru = {
2323 updateScript = gnome3.updateScript {
2424 packageName = pname;
25+ versionPolicy = "odd-unstable";
2526 };
2627 };
2728
pkgs/development/libraries/libdazzle/default.nix+2−2
@@ -3,14 +3,14 @@
33
44stdenv.mkDerivation rec {
55 pname = "libdazzle";
6− version = "3.38.0";
6+ version = "3.40.0";
77
88 outputs = [ "out" "dev" "devdoc" ];
99 outputBin = "dev";
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/libdazzle/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "13v7s46cgw135ycx0byn7am4inn33slrhljq0v0wwfwl2y1g52p1";
13+ sha256 = "19abrrjsyjhhl1xflnb0likb9wwzz78fa1mk2b064rpscmz9mafv";
1414 };
1515
1616 nativeBuildInputs = [ ninja meson pkg-config vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ];
pkgs/development/libraries/libepc/default.nix+1
@@ -34,6 +34,7 @@ in stdenv.mkDerivation rec {
3434 passthru = {
3535 updateScript = gnome3.updateScript {
3636 packageName = pname;
37+ versionPolicy = "odd-unstable";
3738 };
3839 };
3940
pkgs/development/libraries/libgda/6.x.nix+1
@@ -74,6 +74,7 @@ stdenv.mkDerivation rec {
7474 updateScript = gnome3.updateScript {
7575 packageName = pname;
7676 attrPath = "libgda6";
77+ versionPolicy = "odd-unstable";
7778 };
7879 };
7980
pkgs/development/libraries/libgda/default.nix+1
@@ -86,6 +86,7 @@ assert postgresSupport -> postgresql != null;
8686 passthru = {
8787 updateScript = gnome3.updateScript {
8888 packageName = pname;
89+ versionPolicy = "odd-unstable";
8990 };
9091 };
9192
pkgs/development/libraries/libgdamm/default.nix+1
@@ -26,6 +26,7 @@ in stdenv.mkDerivation rec {
2626 passthru = {
2727 updateScript = gnome3.updateScript {
2828 packageName = pname;
29+ versionPolicy = "odd-unstable";
2930 };
3031 };
3132
pkgs/development/libraries/libgee/default.nix+3−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "libgee";
5− version = "0.20.3";
5+ version = "0.20.4";
66
77 outputs = [ "out" "dev" ];
88
99 src = fetchurl {
1010 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
11− sha256 = "1pm525wm11dhwz24m8bpcln9547lmrigl6cxf3qsbg4cr3pyvdfh";
11+ sha256 = "03nyf8n7i7f67fsh220g52slmihdk1lv4iwspm7xmkgrj3rink2j";
1212 };
1313
1414 doCheck = true;
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
2222 passthru = {
2323 updateScript = gnome3.updateScript {
2424 packageName = pname;
25+ versionPolicy = "odd-unstable";
2526 };
2627 };
2728
pkgs/development/libraries/libgnomekbd/default.nix+7−4
@@ -11,10 +11,6 @@ stdenv.mkDerivation rec {
1111 sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp";
1212 };
1313
14− passthru = {
15− updateScript = gnome3.updateScript { packageName = pname; };
16− };
17−
1814 nativeBuildInputs = [
1915 file
2016 intltool
@@ -29,6 +25,13 @@ stdenv.mkDerivation rec {
2925 glib
3026 ];
3127
28+ passthru = {
29+ updateScript = gnome3.updateScript {
30+ packageName = pname;
31+ versionPolicy = "odd-unstable";
32+ };
33+ };
34+
3235 meta = with lib; {
3336 description = "Keyboard management library";
3437 maintainers = teams.gnome.members;
pkgs/development/libraries/libgsf/default.nix+1
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
2525 passthru = {
2626 updateScript = gnome3.updateScript {
2727 packageName = pname;
28+ versionPolicy = "odd-unstable";
2829 };
2930 };
3031
pkgs/development/libraries/libgtop/default.nix+1
@@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
3333 passthru = {
3434 updateScript = gnome3.updateScript {
3535 packageName = pname;
36+ versionPolicy = "odd-unstable";
3637 };
3738 };
3839
pkgs/development/libraries/libgudev/default.nix+21−6
@@ -1,28 +1,43 @@
11{ lib, stdenv
22, fetchurl
33, pkg-config
4+, meson
5+, ninja
46, udev
57, glib
68, gobject-introspection
79, gnome3
10+, vala
811}:
912
1013stdenv.mkDerivation rec {
1114 pname = "libgudev";
12− version = "234";
15+ version = "236";
1316
1417 outputs = [ "out" "dev" ];
1518
1619 src = fetchurl {
1720 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
18− sha256 = "0drf39qhsdz35kwb18hnfj2ig4yfxhfks66m783zlhnvy2narbhv";
21+ sha256 = "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5";
1922 };
2023
21− nativeBuildInputs = [ pkg-config gobject-introspection ];
22− buildInputs = [ udev glib ];
24+ nativeBuildInputs = [
25+ pkg-config
26+ gobject-introspection
27+ meson
28+ ninja
29+ vala
30+ ];
2331
24− # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway.
25− configureFlags = [ "--disable-umockdev" ];
32+ buildInputs = [
33+ udev
34+ glib
35+ ];
36+
37+ mesonFlags = [
38+ # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway
39+ "-Dtests=disabled"
40+ ];
2641
2742 passthru = {
2843 updateScript = gnome3.updateScript {
pkgs/development/libraries/libgweather/default.nix+51−11
@@ -1,24 +1,57 @@
1−{ lib, stdenv, fetchurl, meson, ninja, pkg-config, libxml2, glib, gtk3, gettext, libsoup
2−, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gobject-introspection, python3, tzdata, geocode-glib, vala, gnome3 }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, meson
5+, ninja
6+, pkg-config
7+, libxml2
8+, glib
9+, gtk3
10+, gettext
11+, libsoup
12+, gtk-doc
13+, docbook-xsl-nons
14+, docbook_xml_dtd_43
15+, gobject-introspection
16+, python3
17+, tzdata
18+, geocode-glib
19+, vala
20+, gnome3
21+}:
322
423stdenv.mkDerivation rec {
524 pname = "libgweather";
6− version = "3.36.1";
25+ version = "40.0";
726
827 outputs = [ "out" "dev" "devdoc" ];
928
1029 src = fetchurl {
11− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
12− sha256 = "0l74hc02rvzm4p530y539a67jwb080fqdaazdl8j0fr3xvq0j9yy";
30+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
31+ sha256 = "1rkf4yv43qcahyx7bismdv6z2vh5azdnm1fqfmnzrada9cm8ykna";
1332 };
1433
15− nativeBuildInputs = [ meson ninja pkg-config gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ];
16− buildInputs = [ glib gtk3 libsoup libxml2 geocode-glib ];
34+ nativeBuildInputs = [
35+ meson
36+ ninja
37+ pkg-config
38+ gettext
39+ vala
40+ gtk-doc
41+ docbook-xsl-nons
42+ docbook_xml_dtd_43
43+ gobject-introspection
44+ python3
45+ python3.pkgs.pygobject3
46+ ];
1747
18− postPatch = ''
19− chmod +x meson/meson_post_install.py
20− patchShebangs meson/meson_post_install.py
21− '';
48+ buildInputs = [
49+ glib
50+ gtk3
51+ libsoup
52+ libxml2
53+ geocode-glib
54+ ];
2255
2356 mesonFlags = [
2457 "-Dzoneinfo_dir=${tzdata}/share/zoneinfo"
@@ -26,9 +59,16 @@ stdenv.mkDerivation rec {
2659 "-Dgtk_doc=true"
2760 ];
2861
62+ postPatch = ''
63+ chmod +x meson/meson_post_install.py
64+ patchShebangs meson/meson_post_install.py
65+ patchShebangs data/gen_locations_variant.py
66+ '';
67+
2968 passthru = {
3069 updateScript = gnome3.updateScript {
3170 packageName = pname;
71+ versionPolicy = "odd-unstable";
3272 };
3373 };
3474
pkgs/development/libraries/libhandy/default.nix+37−7
@@ -1,4 +1,5 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchurl
34, meson
45, ninja
@@ -6,9 +7,10 @@
67, gobject-introspection
78, vala
89, gtk-doc
9−, docbook_xsl
10+, docbook-xsl-nons
1011, docbook_xml_dtd_43
1112, gtk3
13+, enableGlade ? false
1214, glade
1315, dbus
1416, xvfb_run
@@ -18,23 +20,32 @@
1820, hicolor-icon-theme
1921, at-spi2-atk
2022, at-spi2-core
23+, gnome3
24+, libhandy
25+, runCommand
2126}:
2227
2328stdenv.mkDerivation rec {
2429 pname = "libhandy";
25− version = "1.2.0";
30+ version = "1.2.2";
2631
27− outputs = [ "out" "dev" "devdoc" "glade" ];
32+ outputs = [
33+ "out"
34+ "dev"
35+ "devdoc"
36+ ] ++ lib.optionals enableGlade [
37+ "glade"
38+ ];
2839 outputBin = "dev";
2940
3041 src = fetchurl {
3142 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
32− sha256 = "sha256-OfWQriCRDnb+HAYHsuvliXUPRWENau7Fww4u5gKiCyU=";
43+ sha256 = "sha256-R//Shl0CvRyleVIt6t1+L5U2Lx8gJGL9XuriuBZosEg=";
3344 };
3445
3546 nativeBuildInputs = [
3647 docbook_xml_dtd_43
37− docbook_xsl
48+ docbook-xsl-nons
3849 gobject-introspection
3950 gtk-doc
4051 libxml2
@@ -46,9 +57,10 @@ stdenv.mkDerivation rec {
4657
4758 buildInputs = [
4859 gdk-pixbuf
49− glade
5060 gtk3
5161 libxml2
62+ ] ++ lib.optionals enableGlade [
63+ glade
5264 ];
5365
5466 checkInputs = [
@@ -62,6 +74,7 @@ stdenv.mkDerivation rec {
6274
6375 mesonFlags = [
6476 "-Dgtk_doc=true"
77+ "-Dglade_catalog=${if enableGlade then "enabled" else "disabled"}"
6578 ];
6679
6780 # Uses define_variable in pkg-config, but we still need it to use the glade output
@@ -79,6 +92,23 @@ stdenv.mkDerivation rec {
7992 meson test --print-errorlogs
8093 '';
8194
95+ passthru = {
96+ updateScript = gnome3.updateScript {
97+ packageName = pname;
98+ };
99+ } // lib.optionalAttrs (!enableGlade) {
100+ glade =
101+ let
102+ libhandyWithGlade = libhandy.override {
103+ enableGlade = true;
104+ };
105+ in runCommand "${libhandy.name}-glade" {} ''
106+ cp -r "${libhandyWithGlade.glade}" "$out"
107+ chmod -R +w "$out"
108+ sed -e "s#${libhandyWithGlade.out}#${libhandy.out}#g" -e "s#${libhandyWithGlade.glade}#$out#g" -i $(find "$out" -type f)
109+ '';
110+ };
111+
82112 meta = with lib; {
83113 changelog = "https://gitlab.gnome.org/GNOME/libhandy/-/tags/${version}";
84114 description = "Building blocks for modern adaptive GNOME apps";
pkgs/development/libraries/libhttpseverywhere/default.nix+1
@@ -36,6 +36,7 @@ in stdenv.mkDerivation rec {
3636 passthru = {
3737 updateScript = gnome3.updateScript {
3838 packageName = pname;
39+ versionPolicy = "odd-unstable";
3940 };
4041 };
4142
pkgs/development/libraries/libmanette/default.nix+1
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
5151 passthru = {
5252 updateScript = gnome3.updateScript {
5353 packageName = pname;
54+ versionPolicy = "odd-unstable";
5455 };
5556 };
5657
pkgs/development/libraries/libpeas/default.nix+3−2
@@ -4,13 +4,13 @@
44
55stdenv.mkDerivation rec {
66 pname = "libpeas";
7− version = "1.28.0";
7+ version = "1.30.0";
88
99 outputs = [ "out" "dev" ];
1010
1111 src = fetchurl {
1212 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
13− sha256 = "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2";
13+ sha256 = "18xrk1c1ixlhkmykcfiafrl2am470ws687xqvjlq40zwkcp5dx8b";
1414 };
1515
1616 nativeBuildInputs = [ pkg-config meson ninja gettext gobject-introspection ];
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
2323 passthru = {
2424 updateScript = gnome3.updateScript {
2525 packageName = pname;
26+ versionPolicy = "odd-unstable";
2627 };
2728 };
2829
pkgs/development/libraries/libpst/default.nix+4−3
@@ -12,11 +12,12 @@
1212}:
1313
1414stdenv.mkDerivation rec {
15− name = "libpst-0.6.75";
15+ pname = "libpst";
16+ version = "0.6.76";
1617
1718 src = fetchurl {
18− url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz";
19− sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac";
19+ url = "http://www.five-ten-sg.com/libpst/packages/${pname}-${version}.tar.gz";
20+ sha256 = "0hhbbb8ddsgjhv9y1xd8s9ixlhdnjmhw12v06jwx4j6vpgp1na9x";
2021 };
2122
2223 nativeBuildInputs = [
pkgs/development/libraries/librest/default.nix+25−6
@@ -1,4 +1,12 @@
1−{ lib, stdenv, fetchurl, pkg-config, glib, libsoup, gobject-introspection, gnome3 }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, pkg-config
5+, glib
6+, libsoup
7+, gobject-introspection
8+, gnome3
9+}:
210
311stdenv.mkDerivation rec {
412 pname = "rest";
@@ -9,23 +17,34 @@ stdenv.mkDerivation rec {
917 sha256 = "0513aad38e5d3cedd4ae3c551634e3be1b9baaa79775e53b2dba9456f15b01c9";
1018 };
1119
12− nativeBuildInputs = [ pkg-config gobject-introspection ];
13− buildInputs = [ glib libsoup ];
20+ nativeBuildInputs = [
21+ pkg-config
22+ gobject-introspection
23+ ];
1424
15− configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ];
25+ buildInputs = [
26+ glib
27+ libsoup
28+ ];
29+
30+ configureFlags = [
31+ # Remove when https://gitlab.gnome.org/GNOME/librest/merge_requests/2 is merged.
32+ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"
33+ ];
1634
1735 passthru = {
1836 updateScript = gnome3.updateScript {
1937 packageName = pname;
2038 attrPath = "librest";
39+ versionPolicy = "odd-unstable";
2140 };
2241 };
2342
2443 meta = with lib; {
2544 description = "Helper library for RESTful services";
2645 homepage = "https://wiki.gnome.org/Projects/Librest";
27− license = licenses.lgpl21;
28− platforms = platforms.linux;
46+ license = licenses.lgpl21Only;
47+ platforms = platforms.unix;
2948 maintainers = teams.gnome.members;
3049 };
3150}
pkgs/development/libraries/librsvg/default.nix+62−27
@@ -1,47 +1,79 @@
1−{ lib, stdenv, fetchurl, pkg-config, glib, gdk-pixbuf, pango, cairo, libxml2
2−, bzip2, libintl, darwin, rustc, cargo, gnome3
3−, vala, gobject-introspection }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, pkg-config
5+, glib
6+, gdk-pixbuf
7+, pango
8+, cairo
9+, libxml2
10+, bzip2
11+, libintl
12+, ApplicationServices
13+, Foundation
14+, libobjc
15+, rustc
16+, cargo
17+, gnome3
18+, vala
19+, gobject-introspection
20+, nixosTests
21+}:
422
5−let
6− pname = "librsvg";
7− version = "2.50.1";
8−in
923stdenv.mkDerivation rec {
10− name = "${pname}-${version}";
11−
12− src = fetchurl {
13− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
14− sha256 = "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv";
15− };
24+ pname = "librsvg";
25+ version = "2.50.5";
1626
1727 outputs = [ "out" "dev" "installedTests" ];
1828
19− buildInputs = [ libxml2 bzip2 pango libintl ]
20− ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ];
29+ src = fetchurl {
30+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
31+ sha256 = "0wlj5g1jgp93sj3rr6qspj282whz13ahnv8ca99d7zilq9s1aw1j";
32+ };
2133
22− NIX_LDFLAGS = if stdenv.isDarwin then "-lobjc" else null;
34+ nativeBuildInputs = [
35+ pkg-config
36+ rustc
37+ cargo
38+ vala
39+ gobject-introspection
40+ ] ++ lib.optionals stdenv.isDarwin [
41+ ApplicationServices
42+ Foundation
43+ ];
2344
24− propagatedBuildInputs = [ glib gdk-pixbuf cairo ];
45+ buildInputs = [
46+ libxml2
47+ bzip2
48+ pango
49+ libintl
50+ ] ++ lib.optionals stdenv.isDarwin [
51+ libobjc
52+ ];
2553
26− nativeBuildInputs = [ pkg-config rustc cargo vala gobject-introspection ]
27− ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
28− ApplicationServices
29− ]);
54+ propagatedBuildInputs = [
55+ glib
56+ gdk-pixbuf
57+ cairo
58+ ];
3059
3160 configureFlags = [
3261 "--enable-introspection"
62+ ] ++ lib.optionals (!stdenv.isDarwin) [
63+ # Vapi does not build on MacOS.
64+ # https://github.com/NixOS/nixpkgs/pull/117081#issuecomment-827782004
3365 "--enable-vala"
66+ ] ++ [
3467 "--enable-installed-tests"
3568 "--enable-always-build-tests"
3669 ] ++ lib.optional stdenv.isDarwin "--disable-Bsymbolic";
3770
3871 makeFlags = [
39− "installed_test_metadir=$(installedTests)/share/installed-tests/RSVG"
40− "installed_testdir=$(installedTests)/libexec/installed-tests/RSVG"
72+ "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/RSVG"
73+ "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/RSVG"
4174 ];
4275
43− NIX_CFLAGS_COMPILE
44− = lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo";
76+ doCheck = false; # all tests fail on libtool-generated rsvg-convert not being able to find coreutils
4577
4678 # It wants to add loaders and update the loaders.cache in gdk-pixbuf
4779 # Patching the Makefiles to it creates rsvg specific loaders and the
@@ -63,8 +95,6 @@ stdenv.mkDerivation rec {
6395 -i gdk-pixbuf-loader/librsvg.thumbnailer.in
6496 '';
6597
66− doCheck = false; # fails 20 of 145 tests, very likely to be buggy
67−
6898 # Merge gdkpixbuf and librsvg loaders
6999 postInstall = ''
70100 mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp
@@ -75,6 +105,11 @@ stdenv.mkDerivation rec {
75105 passthru = {
76106 updateScript = gnome3.updateScript {
77107 packageName = pname;
108+ versionPolicy = "odd-unstable";
109+ };
110+
111+ tests = {
112+ installedTests = nixosTests.installed-tests.librsvg;
78113 };
79114 };
80115
pkgs/development/libraries/libsigcxx/3.0.nixnew file+42
@@ -0,0 +1,42 @@
1+{ stdenv
2+, lib
3+, fetchurl
4+, pkg-config
5+, meson
6+, ninja
7+, gnome3
8+}:
9+
10+stdenv.mkDerivation rec {
11+ pname = "libsigc++";
12+ version = "3.0.6";
13+
14+ src = fetchurl {
15+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
16+ sha256 = "tw7c9GEWUcVKQm4QmxcZbh+hfaCQWSpQAOLRNMA6xc4=";
17+ };
18+
19+ nativeBuildInputs = [
20+ pkg-config
21+ meson
22+ ninja
23+ ];
24+
25+ doCheck = true;
26+
27+ passthru = {
28+ updateScript = gnome3.updateScript {
29+ packageName = pname;
30+ attrPath = "libsigcxx30";
31+ versionPolicy = "odd-unstable";
32+ };
33+ };
34+
35+ meta = with lib; {
36+ homepage = "https://libsigcplusplus.github.io/libsigcplusplus/";
37+ description = "A typesafe callback system for standard C++";
38+ license = licenses.lgpl21Plus;
39+ maintainers = teams.gnome.members;
40+ platforms = platforms.all;
41+ };
42+}
pkgs/development/libraries/libsigcxx/default.nix+5−4
@@ -1,15 +1,15 @@
1−{ lib, stdenv, fetchurl, pkg-config, gnum4, gnome3 }:
1+{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gnome3 }:
22
33stdenv.mkDerivation rec {
44 pname = "libsigc++";
5− version = "2.10.1";
5+ version = "2.10.6";
66
77 src = fetchurl {
88 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
9− sha256 = "00v08km4wwzbh6vjxb21388wb9dm6g2xh14rgwabnv4c2wk5z8n9";
9+ sha256 = "sha256-3aF23EaBvanVoqwbxVJzvdOBZit6bUnpGCZ9E+h3Ths=";
1010 };
1111
12− nativeBuildInputs = [ pkg-config gnum4 ];
12+ nativeBuildInputs = [ pkg-config meson ninja ];
1313
1414 doCheck = true;
1515
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
1717 updateScript = gnome3.updateScript {
1818 packageName = pname;
1919 attrPath = "libsigcxx";
20+ versionPolicy = "odd-unstable";
2021 };
2122 };
2223
pkgs/development/libraries/libsoup/default.nix+1
@@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
4848 propagatedUserEnvPackages = [ glib-networking.out ];
4949 updateScript = gnome3.updateScript {
5050 packageName = pname;
51+ versionPolicy = "odd-unstable";
5152 };
5253 };
5354
pkgs/development/libraries/libunity/default.nix+13−9
@@ -1,4 +1,5 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchgit
34, pkg-config
45, glib
@@ -14,16 +15,24 @@
1415
1516stdenv.mkDerivation {
1617 pname = "libunity";
17− version = "unstable-2019-03-19";
18+ version = "unstable-2021-02-01";
1819
1920 outputs = [ "out" "dev" "py" ];
2021
22+ # Obtained from https://git.launchpad.net/ubuntu/+source/libunity/log/
2123 src = fetchgit {
2224 url = "https://git.launchpad.net/ubuntu/+source/libunity";
23− rev = "import/7.1.4+19.04.20190319-0ubuntu1";
24− sha256 = "15b49v88v74q20a5c0lq867qnlz7fx20xifl6j8ha359r0zkfwzj";
25+ rev = "import/7.1.4+19.04.20190319-5";
26+ sha256 = "LHUs6kl1srS6Xektx+jmm4SXLR47VuQ9IhYbBxf2Wc8=";
2527 };
2628
29+ patches = [
30+ # Fix builf with latest Vala
31+ # https://code.launchpad.net/~jtojnar/libunity/libunity
32+ # Did not send upstream because Ubuntu is stuck on Vala 0.48.
33+ ./fix-vala.patch
34+ ];
35+
2736 nativeBuildInputs = [
2837 autoreconfHook
2938 gobject-introspection
@@ -43,11 +52,6 @@ stdenv.mkDerivation {
4352 libdbusmenu
4453 ];
4554
46− patches = [
47− # See: https://gitlab.gnome.org/GNOME/vala/issues/766
48− ./fix-vala.patch
49− ];
50−
5155 preConfigure = ''
5256 intltoolize
5357 '';
pkgs/development/libraries/libunity/fix-vala.patch+10−34
@@ -1,36 +1,12 @@
1−diff -ru old/libunity/src/unity-aggregator-scope.vala libunity/src/unity-aggregator-scope.vala
2−--- old/libunity/src/unity-aggregator-scope.vala 1969-12-31 19:00:01.000000000 -0500
3−+++ libunity/src/unity-aggregator-scope.vala 2019-09-21 17:06:12.663864891 -0400
4−@@ -51,7 +51,7 @@
5− */
6− public abstract int category_index_for_scope_id (string scope_id);
1+--- a/protocol/protocol-icon.vala 2013-08-27 12:53:57 +0000
2++++ b/protocol/protocol-icon.vala 2021-04-13 22:34:41 +0000
3+@@ -185,7 +185,7 @@
4+ }
75
8−- public AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
9−+ protected AggregatorScope (string dbus_path_, string id_, MergeMode merge_mode = AggregatorScope.MergeMode.OWNER_SCOPE, bool proxy_filter_hints = false)
10− {
11− Object (dbus_path: dbus_path_, id: id_, is_master: true,
12− merge_mode: merge_mode, proxy_filter_hints: proxy_filter_hints);
13−diff -ru old/libunity/src/unity-deprecated-scope.vala libunity/src/unity-deprecated-scope.vala
14−--- old/libunity/src/unity-deprecated-scope.vala 1969-12-31 19:00:01.000000000 -0500
15−+++ libunity/src/unity-deprecated-scope.vala 2019-09-21 17:06:39.721627805 -0400
16−@@ -61,7 +61,7 @@
17− internal CategorySet _categories;
18− internal FilterSet _filters;
19−
20−- public DeprecatedScopeBase (string dbus_path_, string id_)
21−+ protected DeprecatedScopeBase (string dbus_path_, string id_)
6+ /* Added to GIcon interface in 2.37 */
7+- private Variant serialize ()
8++ private Variant? serialize ()
229 {
23− Object (dbus_path: dbus_path_, id: id_);
24− }
25−diff -ru old/libunity/tools/preview-renderer.vala libunity/tools/preview-renderer.vala
26−--- old/libunity/tools/preview-renderer.vala 1969-12-31 19:00:01.000000000 -0500
27−+++ libunity/tools/preview-renderer.vala 2019-09-21 17:09:16.201522110 -0400
28−@@ -63,7 +63,7 @@
29− */
30− public abstract class GridRenderer: PreviewRenderer
31− {
32−- public GridRenderer()
33−+ protected GridRenderer()
34− {
35− Object();
36− }
10+ Variant? ret = null;
11+ return ret;
12+
pkgs/development/libraries/libvirt-glib/default.nix+35−9
@@ -1,21 +1,47 @@
1−{ lib, stdenv, fetchurl, pkg-config, gobject-introspection, intltool, vala
2−, libcap_ng, libvirt, libxml2
1+{ lib
2+, stdenv
3+, fetchurl
4+, meson
5+, ninja
6+, pkg-config
7+, gobject-introspection
8+, gettext
9+, gtk-doc
10+, docbook-xsl-nons
11+, vala
12+, libcap_ng
13+, libvirt
14+, libxml2
315}:
416
517stdenv.mkDerivation rec {
6− name = "libvirt-glib-3.0.0";
18+ name = "libvirt-glib-4.0.0";
719
8− outputs = [ "out" "dev" ];
20+ outputs = [ "out" "dev" "devdoc" ];
921
1022 src = fetchurl {
11− url = "https://libvirt.org/sources/glib/${name}.tar.gz";
12− sha256 = "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz";
23+ url = "https://libvirt.org/sources/glib/${name}.tar.xz";
24+ sha256 = "hCP3Bp2qR2MHMh0cEeLswoU0DNMsqfwFIHdihD7erL0=";
1325 };
1426
15− nativeBuildInputs = [ pkg-config intltool vala gobject-introspection ];
16− buildInputs = [ libcap_ng libvirt libxml2 gobject-introspection ];
27+ nativeBuildInputs = [
28+ meson
29+ ninja
30+ pkg-config
31+ gettext
32+ gtk-doc
33+ docbook-xsl-nons
34+ vala
35+ gobject-introspection
36+ ];
37+
38+ buildInputs = [
39+ libcap_ng
40+ libvirt
41+ libxml2
42+ gobject-introspection
43+ ];
1744
18− enableParallelBuilding = true;
1945 strictDeps = true;
2046
2147 meta = with lib; {
pkgs/development/libraries/libwnck/3.x.nix+1
@@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
6363 updateScript = gnome3.updateScript {
6464 packageName = pname;
6565 attrPath = "${pname}${lib.versions.major version}";
66+ versionPolicy = "odd-unstable";
6667 };
6768 };
6869
pkgs/development/libraries/libxmlxx/default.nix+1
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
1818 passthru = {
1919 updateScript = gnome3.updateScript {
2020 packageName = pname;
21+ versionPolicy = "odd-unstable";
2122 };
2223 };
2324
pkgs/development/libraries/libzapojit/default.nix+1
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
1717 passthru = {
1818 updateScript = gnome3.updateScript {
1919 packageName = pname;
20+ versionPolicy = "odd-unstable";
2021 };
2122 };
2223
pkgs/development/libraries/pango/default.nix+3−11
@@ -1,7 +1,6 @@
11{ lib
22, stdenv
33, fetchurl
4−, fetchpatch
54, pkg-config
65, cairo
76, harfbuzz
@@ -22,23 +21,15 @@
2221
2322stdenv.mkDerivation rec {
2423 pname = "pango";
25− version = "1.48.3";
24+ version = "1.48.4";
2625
2726 outputs = [ "bin" "out" "dev" "devdoc" ];
2827
2928 src = fetchurl {
3029 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
31− sha256 = "0ijbkcs6217ygzphlpi0vajxkccifdbsl0jdjpy8wz11h9f19sin";
30+ sha256 = "0ym3cvajy2asapj8xbhfpy05rak79afrhi32hiss0w900vxi72a1";
3231 };
3332
34− patches = [
35− # Install developer documentation.
36− (fetchpatch {
37− url = "https://gitlab.gnome.org/GNOME/pango/commit/a2f35860115e8cd44f07d5158e2df059e8163a08.patch";
38− sha256 = "hN7O4DBk4A+TmBl6DGx6RHni5qRBg6akdjv9o3iWKDQ=";
39− })
40− ];
41−
4233 nativeBuildInputs = [
4334 meson ninja
4435 glib # for glib-mkenum
@@ -90,6 +81,7 @@ stdenv.mkDerivation rec {
9081 passthru = {
9182 updateScript = gnome3.updateScript {
9283 packageName = pname;
84+ versionPolicy = "odd-unstable";
9385 };
9486 };
9587
pkgs/development/libraries/pangomm/2.48.nixnew file+65
@@ -0,0 +1,65 @@
1+{ stdenv
2+, lib
3+, fetchurl
4+, pkg-config
5+, meson
6+, ninja
7+, python3
8+, pango
9+, glibmm_2_68
10+, cairomm_1_16
11+, gnome3
12+, ApplicationServices
13+}:
14+
15+stdenv.mkDerivation rec {
16+ pname = "pangomm";
17+ version= "2.48.0";
18+
19+ outputs = [ "out" "dev" ];
20+
21+ src = fetchurl {
22+ url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
23+ sha256 = "sha256-ng7UdMM/jCACyp4rYcoNHz2OQJ4J6Z9NjBnur8z1W3g=";
24+ };
25+
26+ nativeBuildInputs = [
27+ pkg-config
28+ meson
29+ ninja
30+ python3
31+ ] ++ lib.optional stdenv.isDarwin [
32+ ApplicationServices
33+ ];
34+
35+ propagatedBuildInputs = [
36+ pango
37+ glibmm_2_68
38+ cairomm_1_16
39+ ];
40+
41+ doCheck = true;
42+
43+ passthru = {
44+ updateScript = gnome3.updateScript {
45+ packageName = pname;
46+ attrPath = "${pname}_2_48";
47+ versionPolicy = "odd-unstable";
48+ };
49+ };
50+
51+ meta = with lib; {
52+ description = "C++ interface to the Pango text rendering library";
53+ longDescription = ''
54+ Pango is a library for laying out and rendering of text, with an
55+ emphasis on internationalization. Pango can be used anywhere
56+ that text layout is needed, though most of the work on Pango so
57+ far has been done in the context of the GTK widget toolkit.
58+ Pango forms the core of text and font handling for GTK.
59+ '';
60+ homepage = "https://www.pango.org/";
61+ license = licenses.lgpl21Plus;
62+ maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]);
63+ platforms = platforms.unix;
64+ };
65+}
pkgs/development/libraries/pangomm/default.nix+1
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
2222 passthru = {
2323 updateScript = gnome3.updateScript {
2424 packageName = pname;
25+ versionPolicy = "odd-unstable";
2526 };
2627 };
2728
pkgs/development/libraries/poppler/default.nix+15−2
@@ -10,7 +10,7 @@
1010let
1111 mkFlag = optset: flag: "-DENABLE_${flag}=${if optset then "on" else "off"}";
1212in
13−stdenv.mkDerivation rec {
13+stdenv.mkDerivation (rec {
1414 name = "poppler-${suffix}-${version}";
1515 version = "21.02.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too!
1616
@@ -63,4 +63,17 @@ stdenv.mkDerivation rec {
6363 platforms = platforms.all;
6464 maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members;
6565 };
66−}
66+} // lib.optionalAttrs stdenv.isDarwin {
67+ patches = [
68+ # Fix build due to improperly used volatile in poppler-glib.
69+ # https://gitlab.freedesktop.org/poppler/poppler/merge_requests/836
70+ (fetchpatch {
71+ url = "https://gitlab.freedesktop.org/poppler/poppler/commit/47de887d7658cfd68df44b3acf710971054f957b.patch";
72+ sha256 = "uvYibBn2fOEqdotxK0Wpf8KhGYZXrpHdmS4jjlRNCj8=";
73+ })
74+ (fetchpatch {
75+ url = "https://gitlab.freedesktop.org/poppler/poppler/commit/bdd110b45a38e8a4f80f522892e4c4a9e432abd5.patch";
76+ sha256 = "WDUYXX6v5zk7tusz7DGBP58yFzgEvoBlNSLbfk7+QTc=";
77+ })
78+ ];
79+})
pkgs/development/libraries/rarian/default.nix−6
@@ -15,12 +15,6 @@ in stdenv.mkDerivation rec {
1515 ++ (with perlPackages; [ perl XMLParser ]);
1616 configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ];
1717
18− passthru = {
19− updateScript = gnome3.updateScript {
20− packageName = pname;
21− };
22− };
23−
2418 meta = with lib; {
2519 description = "Documentation metadata library based on the proposed Freedesktop.org spec";
2620 homepage = "https://rarian.freedesktop.org/";
pkgs/development/libraries/speechd/default.nix+8
@@ -2,6 +2,7 @@
22, substituteAll
33, pkg-config
44, fetchurl
5+, fetchpatch
56, python3Packages
67, gettext
78, itstool
@@ -51,6 +52,13 @@ in stdenv.mkDerivation rec {
5152 src = ./fix-paths.patch;
5253 utillinux = util-linux;
5354 })
55+
56+ # Fix build with Glib 2.68
57+ # https://github.com/brailcom/speechd/pull/462
58+ (fetchpatch {
59+ url = "https://github.com/brailcom/speechd/commit/a2faab416e42cbdf3d73f98578a89eb7a235e25a.patch";
60+ sha256 = "8Q7tUdKKBBtgXZZnj59OcJOkrCNeBR9gkBjhKlpW0hQ=";
61+ })
5462 ];
5563
5664 nativeBuildInputs = [
pkgs/development/libraries/template-glib/default.nix+1
@@ -23,6 +23,7 @@ stdenv.mkDerivation {
2323 passthru = {
2424 updateScript = gnome3.updateScript {
2525 packageName = pname;
26+ versionPolicy = "odd-unstable";
2627 };
2728 };
2829
pkgs/development/libraries/tepl/default.nix+6−3
@@ -13,13 +13,13 @@
1313
1414stdenv.mkDerivation rec {
1515 pname = "tepl";
16− version = "5.0.1";
16+ version = "6.00.0";
1717
1818 outputs = [ "out" "dev" ];
1919
2020 src = fetchurl {
2121 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
22− sha256 = "sSdJZ2CfUkSEs4d1+p7LKWxtZhaqvQUvKGM5oomRKAQ=";
22+ sha256 = "0qvs7s86gqyyrzi0r5fbrj8zczlgv8xhdjswgbgc1afwjnl9fqx8";
2323 };
2424
2525 nativeBuildInputs = [
@@ -46,7 +46,10 @@ stdenv.mkDerivation rec {
4646 # correctly installed or GVfs metadata are not supported on this platform. In
4747 # the latter case, you should configure Tepl with --disable-gvfs-metadata.
4848
49− passthru.updateScript = gnome3.updateScript { packageName = pname; };
49+ passthru.updateScript = gnome3.updateScript {
50+ packageName = pname;
51+ versionPolicy = "odd-unstable";
52+ };
5053
5154 meta = with lib; {
5255 homepage = "https://wiki.gnome.org/Projects/Tepl";
pkgs/development/libraries/totem-pl-parser/default.nix+1
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
1212 passthru = {
1313 updateScript = gnome3.updateScript {
1414 packageName = pname;
15+ versionPolicy = "odd-unstable";
1516 };
1617 };
1718
pkgs/development/libraries/tracker-miners/default.nix+2−2
@@ -48,11 +48,11 @@
4848
4949stdenv.mkDerivation rec {
5050 pname = "tracker-miners";
51− version = "3.0.4";
51+ version = "3.1.1";
5252
5353 src = fetchurl {
5454 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
55− sha256 = "sha256-E877xx1S93RvPTfQQdjFvBM2pA/13ZK1Nw6GUMJqiY4=";
55+ sha256 = "sha256-5NNhNRsVbyhipSRBX76/BTnHgc2HxmKWYvAmW0gDuLg=";
5656 };
5757
5858 nativeBuildInputs = [
pkgs/development/libraries/tracker/default.nix+20−12
@@ -1,5 +1,6 @@
11{ lib, stdenv
22, fetchurl
3+, fetchpatch
34, gettext
45, meson
56, ninja
@@ -27,15 +28,15 @@
2728, substituteAll
2829}:
2930
30−stdenv.mkDerivation (rec {
31+stdenv.mkDerivation rec {
3132 pname = "tracker";
32− version = "3.0.3";
33+ version = "3.1.1";
3334
3435 outputs = [ "out" "dev" "devdoc" ];
3536
3637 src = fetchurl {
3738 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
38− sha256 = "sha256-b1yEqzvh7aUgUBsq7XIhYWoM8VKRDFN3V7U4vAXv/KM=";
39+ sha256 = "sha256-Q3bi6YRUBm9E96JC5FuZs7/kwDtn+rGauw7Vhsp0iuc=";
3940 };
4041
4142 patches = [
@@ -43,6 +44,17 @@ stdenv.mkDerivation (rec {
4344 src = ./fix-paths.patch;
4445 inherit asciidoc;
4546 })
47+
48+ # Add missing build target dependencies to fix parallel building of docs.
49+ # TODO: Upstream this.
50+ ./fix-docs.patch
51+
52+ # Fix 32bit datetime issue, use this upstream patch until 3.1.2 lands
53+ # https://gitlab.gnome.org/GNOME/tracker/-/merge_requests/401
54+ (fetchpatch {
55+ url = "https://gitlab.gnome.org/GNOME/tracker/merge_requests/401.patch";
56+ sha256 = "QEf+ciGkkCzanmtGO0aig6nAxd+NxjvuNi4RbNOwZEA=";
57+ })
4658 ];
4759
4860 nativeBuildInputs = [
@@ -74,22 +86,23 @@ stdenv.mkDerivation (rec {
7486 libstemmer
7587 ];
7688
77− checkInputs = [
78− python3.pkgs.pygobject3
89+ checkInputs = with python3.pkgs; [
90+ pygobject3
91+ tappy
7992 ];
8093
8194 mesonFlags = [
8295 "-Ddocs=true"
8396 ];
8497
85− # https://gitlab.gnome.org/GNOME/tracker/-/issues/292#note_1075369
86− doCheck = !stdenv.isi686;
98+ doCheck = true;
8799
88100 postPatch = ''
89101 patchShebangs utils/g-ir-merge/g-ir-merge
90102 patchShebangs utils/data-generators/cc/generate
91103 patchShebangs tests/functional-tests/test-runner.sh.in
92104 patchShebangs tests/functional-tests/*.py
105+ patchShebangs examples/python/endpoint.py
93106 '';
94107
95108 preCheck = ''
@@ -134,8 +147,3 @@ stdenv.mkDerivation (rec {
134147 platforms = platforms.linux;
135148 };
136149}
137− // {
138− # TMP: fatal error: libtracker-sparql/tracker-sparql-enum-types.h: No such file or directory
139− enableParallelBuilding = false;
140− }
141−)
pkgs/development/libraries/tracker/fix-docs.patchnew file+28
@@ -0,0 +1,28 @@
1+diff --git a/docs/reference/libtracker-sparql/examples/meson.build b/docs/reference/libtracker-sparql/examples/meson.build
2+index 1cb1d9f3f..313c72345 100644
3+--- a/docs/reference/libtracker-sparql/examples/meson.build
4++++ b/docs/reference/libtracker-sparql/examples/meson.build
5+@@ -1,20 +1,20 @@
6+ executable(
7+ 'readonly-example',
8+ 'readonly-example.c',
9+- dependencies: tracker_sparql_dep,
10++ dependencies: [tracker_common_dep, tracker_sparql_dep],
11+ build_by_default: true
12+ )
13+
14+ executable(
15+ 'writeonly-example',
16+ 'writeonly-example.c',
17+- dependencies: tracker_sparql_dep,
18++ dependencies: [tracker_common_dep, tracker_sparql_dep],
19+ build_by_default: true
20+ )
21+
22+ executable(
23+ 'writeonly-with-blank-nodes-example',
24+ 'writeonly-with-blank-nodes-example.c',
25+- dependencies: tracker_sparql_dep,
26++ dependencies: [tracker_common_dep, tracker_sparql_dep],
27+ build_by_default: true
28+ )
pkgs/development/libraries/umockdev/default.nix+27−16
@@ -1,6 +1,8 @@
1−{ lib, stdenv
2−, docbook_xsl
1+{ stdenv
2+, lib
3+, docbook-xsl-nons
34, fetchurl
5+, fetchpatch
46, glib
57, gobject-introspection
68, gtk-doc
@@ -19,21 +21,23 @@ stdenv.mkDerivation rec {
1921 pname = "umockdev";
2022 version = "0.15.4";
2123
22− outputs = [ "bin" "out" "dev" "doc" ];
24+ outputs = [ "bin" "out" "dev" "devdoc" ];
2325
2426 src = fetchurl {
2527 url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz";
2628 sha256 = "09k8jwvsphd97hcagf0zaf0hwzlzq2r8jfgbmvj55k7ylrg8hjxg";
2729 };
2830
29− mesonFlags = [
30− "-Dgtk_doc=true"
31+ patches = [
32+ # Fix build with Vala 0.52
33+ (fetchpatch {
34+ url = "https://github.com/martinpitt/umockdev/commit/a236f0b55fbb6ff50a6429da9d404703d6637d94.patch";
35+ sha256 = "sZs9Ove1r7te/a9vmWUmFetLVhyzhHmx7ijhkK/2S5o=";
36+ })
3137 ];
3238
33− buildInputs = [ glib systemd libgudev ];
34−
3539 nativeBuildInputs = [
36− docbook_xsl
40+ docbook-xsl-nons
3741 gobject-introspection
3842 gtk-doc
3943 meson
@@ -42,20 +46,27 @@ stdenv.mkDerivation rec {
4246 vala
4347 ];
4448
45− checkInputs = [ python3 which usbutils ];
49+ buildInputs = [
50+ glib
51+ systemd
52+ libgudev
53+ ];
54+
55+ checkInputs = [
56+ python3
57+ which
58+ usbutils
59+ ];
4660
47− enableParallelBuilding = true;
61+ mesonFlags = [
62+ "-Dgtk_doc=true"
63+ ];
4864
4965 doCheck = true;
5066
51− postInstall = ''
52− mkdir -p $doc/share/doc/umockdev/
53− mv docs/reference $doc/share/doc/umockdev/
54− '';
55−
5667 meta = with lib; {
5768 description = "Mock hardware devices for creating unit tests";
58− license = licenses.lgpl2;
69+ license = licenses.lgpl21Plus;
5970 maintainers = with maintainers; [ flokli ];
6071 platforms = with platforms; linux;
6172 };
pkgs/development/libraries/vte/default.nix+24−17
@@ -11,6 +11,7 @@
1111, gtk3
1212, gobject-introspection
1313, vala
14+, python3
1415, libxml2
1516, gnutls
1617, gperf
@@ -24,18 +25,25 @@
2425
2526stdenv.mkDerivation rec {
2627 pname = "vte";
27− version = "0.62.2";
28+ version = "0.64.1";
2829
2930 outputs = [ "out" "dev" ];
3031
3132 src = fetchurl {
3233 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
33− sha256 = "sha256-sDALvPDALfWBKhCjy45P/3I7q5LAjJegqQwWfPVDr/A=";
34+ sha256 = "sha256-EvtBqf+OA8XxcRtGVgkQpLmzECrsPp52Cc7vTfqYqio=";
3435 };
3536
36− passthru = {
37− updateScript = gnome3.updateScript { packageName = pname; };
38− };
37+ patches = [
38+ # VTE needs a small patch to work with musl:
39+ # https://gitlab.gnome.org/GNOME/vte/issues/72
40+ # Taken from https://git.alpinelinux.org/aports/tree/community/vte3
41+ (fetchpatch {
42+ name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch";
43+ url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd";
44+ sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU=";
45+ })
46+ ];
3947
4048 nativeBuildInputs = [
4149 gettext
@@ -46,6 +54,7 @@ stdenv.mkDerivation rec {
4654 ninja
4755 pkg-config
4856 vala
57+ python3
4958 ];
5059
5160 buildInputs = [
@@ -64,22 +73,20 @@ stdenv.mkDerivation rec {
6473 pango
6574 ];
6675
67− patches =
68− # VTE needs a small patch to work with musl:
69− # https://gitlab.gnome.org/GNOME/vte/issues/72
70− lib.optional
71− stdenv.hostPlatform.isMusl
72− (fetchpatch {
73− name = "0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch";
74− url = "https://gitlab.gnome.org/GNOME/vte/uploads/c334f767f5d605e0f30ecaa2a0e4d226/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch";
75− sha256 = "1ii9db9i5l3fy2alxz7bjfsgjs3lappnlx339dvxbi2141zknf5r";
76− });
77−
7876 postPatch = ''
7977 patchShebangs perf/*
8078 patchShebangs src/box_drawing_generate.sh
79+ patchShebangs src/parser-seq.py
80+ patchShebangs src/modes.py
8181 '';
8282
83+ passthru = {
84+ updateScript = gnome3.updateScript {
85+ packageName = pname;
86+ versionPolicy = "odd-unstable";
87+ };
88+ };
89+
8390 meta = with lib; {
8491 homepage = "https://www.gnome.org/";
8592 description = "A library implementing a terminal emulator widget for GTK";
@@ -91,7 +98,7 @@ stdenv.mkDerivation rec {
9198 character set conversion, as well as emulating any terminal known to
9299 the system's terminfo database.
93100 '';
94− license = licenses.lgpl2;
101+ license = licenses.lgpl3Plus;
95102 maintainers = with maintainers; [ astsmtl antono lethalman ] ++ teams.gnome.members;
96103 platforms = platforms.unix;
97104 };
pkgs/development/libraries/webkitgtk/default.nix+20−13
@@ -57,8 +57,6 @@
5757
5858assert enableGeoLocation -> geoclue2 != null;
5959
60−with lib;
61−
6260stdenv.mkDerivation rec {
6361 pname = "webkitgtk";
6462 version = "2.32.0";
@@ -72,7 +70,7 @@ stdenv.mkDerivation rec {
7270 sha256 = "1w3b0w8izp0i070grhv19j631sdcd0mcqnjnax13k8mdx7dg8zcx";
7371 };
7472
75− patches = optionals stdenv.isLinux [
73+ patches = lib.optionals stdenv.isLinux [
7674 (substituteAll {
7775 src = ./fix-bubblewrap-paths.patch;
7876 inherit (builtins) storeDir;
@@ -85,7 +83,7 @@ stdenv.mkDerivation rec {
8583 # pick up the wrong gettext. TODO: Find a better solution for
8684 # this, maybe make cmake not look up executables in
8785 # CMAKE_PREFIX_PATH.
88− cmakeFlags+=" -DCMAKE_IGNORE_PATH=${getBin gettext}/bin"
86+ cmakeFlags+=" -DCMAKE_IGNORE_PATH=${lib.getBin gettext}/bin"
8987 '';
9088
9189 nativeBuildInputs = [
@@ -118,7 +116,9 @@ stdenv.mkDerivation rec {
118116 libgcrypt
119117 libidn
120118 libintl
119+ ] ++ lib.optionals stdenv.isLinux [
121120 libmanette
121+ ] ++ [
122122 libnotify
123123 libpthreadstubs
124124 libsecret
@@ -138,16 +138,16 @@ stdenv.mkDerivation rec {
138138 libXdmcp
139139 libXt
140140 libXtst
141− ]) ++ optionals stdenv.isDarwin [
141+ ]) ++ lib.optionals stdenv.isDarwin [
142142 libedit
143143 readline
144− ] ++ optionals stdenv.isLinux [
144+ ] ++ lib.optionals stdenv.isLinux [
145145 bubblewrap
146146 libseccomp
147147 systemd
148148 wayland
149149 xdg-dbus-proxy
150− ] ++ optional enableGeoLocation geoclue2;
150+ ] ++ lib.optional enableGeoLocation geoclue2;
151151
152152 propagatedBuildInputs = [
153153 gtk3
@@ -159,27 +159,34 @@ stdenv.mkDerivation rec {
159159 "-DPORT=GTK"
160160 "-DUSE_LIBHYPHEN=OFF"
161161 "-DUSE_WPE_RENDERER=OFF"
162− ] ++ optionals stdenv.isDarwin [
163− "-DENABLE_GRAPHICS_CONTEXT_3D=OFF"
162+ ] ++ lib.optionals stdenv.isDarwin [
163+ "-DENABLE_GAMEPAD=OFF"
164164 "-DENABLE_GTKDOC=OFF"
165165 "-DENABLE_MINIBROWSER=OFF"
166− "-DENABLE_OPENGL=OFF"
167166 "-DENABLE_QUARTZ_TARGET=ON"
168167 "-DENABLE_VIDEO=ON"
169168 "-DENABLE_WEBGL=OFF"
170169 "-DENABLE_WEB_AUDIO=OFF"
171170 "-DENABLE_X11_TARGET=OFF"
172− "-DUSE_ACCELERATE=0"
171+ "-DUSE_APPLE_ICU=OFF"
172+ "-DUSE_OPENGL_OR_ES=OFF"
173173 "-DUSE_SYSTEM_MALLOC=ON"
174− ] ++ optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON";
174+ ] ++ lib.optionals (!stdenv.isLinux) [
175+ "-DUSE_SYSTEMD=OFF"
176+ ] ++ lib.optional (stdenv.isLinux && enableGLES) "-DENABLE_GLES2=ON";
175177
176178 postPatch = ''
177179 patchShebangs .
180+ '' + lib.optionalString stdenv.isDarwin ''
181+ # It needs malloc_good_size.
182+ sed 22i'#include <malloc/malloc.h>' -i Source/WTF/wtf/FastMalloc.h
183+ # <CommonCrypto/CommonRandom.h> needs CCCryptorStatus.
184+ sed 43i'#include <CommonCrypto/CommonCryptor.h>' -i Source/WTF/wtf/RandomDevice.cpp
178185 '';
179186
180187 requiredSystemFeatures = [ "big-parallel" ];
181188
182− meta = {
189+ meta = with lib; {
183190 description = "Web content rendering engine, GTK port";
184191 homepage = "https://webkitgtk.org/";
185192 license = licenses.bsd2;
pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix+2−2
@@ -32,10 +32,10 @@ stdenv.mkDerivation rec {
3232
3333 buildInputs = [
3434 glib
35− gsettings-desktop-schemas
35+ gsettings-desktop-schemas # settings exposed by settings portal
3636 gtk3
3737 gnome3.gnome-desktop
38− gnome3.gnome-settings-daemon # schemas needed for settings api (fonts, etc)
38+ gnome3.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s)
3939 ];
4040
4141 meta = with lib; {
pkgs/development/libraries/zeitgeist/default.nix+5−5
@@ -20,7 +20,7 @@
2020
2121stdenv.mkDerivation rec {
2222 pname = "zeitgeist";
23− version = "1.0.2";
23+ version = "1.0.3";
2424
2525 outputs = [ "out" "lib" "dev" "man" ] ++ lib.optional pythonSupport "py";
2626
@@ -29,14 +29,14 @@ stdenv.mkDerivation rec {
2929 owner = pname;
3030 repo = pname;
3131 rev = "v${version}";
32− sha256 = "0ig3d3j1n0ghaxsgfww6g2hhcdwx8cljwwfmp9jk1nrvkxd6rnmv";
32+ sha256 = "0y6fyzxl5np4yskcxibd0p03h619w9ir907nhf40h02y0pk1kgkp";
3333 };
3434
3535 patches = [
36− # Fix build with gettext 0.20
36+ # Fix build with Vala 0.52
3737 (fetchpatch {
38− url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/b5c00e80189fd59a059a95c4e276728a2492cb89.patch";
39− sha256 = "1r7f7j3l2p6xlzxajihgx8bzbc2sxcb9spc9pi26rz9bwmngdyq7";
38+ url = "https://gitlab.freedesktop.org/zeitgeist/zeitgeist/commit/64ac3a6f94cd299e5e14945dc31b48f009dec152.patch";
39+ sha256 = "Dw1kNE3JoFdmgcQ0eFoFLYvmxlPjXNj56Jkn2meINz4=";
4040 })
4141 ];
4242
pkgs/development/misc/yelp-tools/default.nix+23−7
@@ -6,28 +6,44 @@
66, itstool
77, gnome3
88, pkg-config
9+, meson
10+, ninja
11+, python3
912}:
1013
11−stdenv.mkDerivation rec {
14+python3.pkgs.buildPythonApplication rec {
1215 pname = "yelp-tools";
13− version = "3.38.0";
16+ version = "40.0";
17+
18+ format = "other";
1419
1520 src = fetchurl {
16− url = "mirror://gnome/sources/yelp-tools/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
17− sha256 = "1c045c794sm83rrjan67jmsk20qacrw1m814p4nw85w5xsry8z30";
21+ url = "mirror://gnome/sources/yelp-tools/${lib.versions.major version}/${pname}-${version}.tar.xz";
22+ sha256 = "1bkanqp3qwmirv06mi99qv2acr5ba5rlhy9zlh0fyrfxygraqjv6";
1823 };
1924
2025 nativeBuildInputs = [
2126 pkg-config
27+ meson
28+ ninja
29+ ];
30+
31+ propagatedBuildInputs = [
32+ libxml2 # xmllint required by yelp-check.
33+ libxslt # xsltproc required by yelp-build and yelp-check.
2234 ];
2335
2436 buildInputs = [
25− libxml2
26− libxslt
27− itstool
37+ itstool # build script checks for its presence but I am not sure if anything uses it
2838 gnome3.yelp-xsl
2939 ];
3040
41+ pythonPath = [
42+ python3.pkgs.lxml
43+ ];
44+
45+ strictDeps = false; # TODO: Meson cannot find xmllint oherwise. Maybe add it to machine file?
46+
3147 doCheck = true;
3248
3349 passthru = {
pkgs/development/python-modules/pyatspi/default.nix+3−2
@@ -2,12 +2,12 @@
22
33buildPythonPackage rec {
44 pname = "pyatspi";
5− version = "2.38.0";
5+ version = "2.38.1";
66 format = "other";
77
88 src = fetchurl {
99 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
10− sha256 = "/4CTEv0ML2HhkcGBoaY4owtXm5G2gs+1oFU1pVJltD0=";
10+ sha256 = "0lc1p6p296c9q3lffi03v902jlsj34i7yyl3rcyaq94wwbljg7z4";
1111 };
1212
1313 nativeBuildInputs = [ pkg-config ];
@@ -23,6 +23,7 @@ buildPythonPackage rec {
2323 updateScript = gnome3.updateScript {
2424 packageName = pname;
2525 attrPath = "python3.pkgs.${pname}";
26+ versionPolicy = "odd-unstable";
2627 };
2728 };
2829
pkgs/development/python-modules/pygobject/3.36.nix−7
@@ -23,13 +23,6 @@ buildPythonPackage rec {
2323 ++ lib.optionals stdenv.isDarwin [ which ncurses ];
2424 propagatedBuildInputs = [ pycairo cairo ];
2525
26− passthru = {
27− updateScript = gnome3.updateScript {
28− packageName = pname;
29− attrPath = "python3.pkgs.${pname}3";
30− };
31− };
32−
3326 meta = with lib; {
3427 homepage = "https://pygobject.readthedocs.io/";
3528 description = "Python bindings for Glib";
pkgs/development/python-modules/pygobject/3.nix+40−11
@@ -1,37 +1,66 @@
1−{ lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection,
2−pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:
1+{ lib
2+, stdenv
3+, fetchurl
4+, buildPythonPackage
5+, pkg-config
6+, glib
7+, gobject-introspection
8+, pycairo
9+, cairo
10+, which
11+, ncurses
12+, meson
13+, ninja
14+, isPy3k
15+, gnome3
16+}:
317
418buildPythonPackage rec {
519 pname = "pygobject";
6− version = "3.38.0";
20+ version = "3.40.1";
721
8− disabled = ! isPy3k;
22+ outputs = [ "out" "dev" ];
23+
24+ disabled = !isPy3k;
925
1026 format = "other";
1127
1228 src = fetchurl {
1329 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
14− sha256 = "A3LRu5Ei/Bn1AKJJsfOMK7Z0hQAPWIdJe0sgWz5whNU=";
30+ sha256 = "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0";
1531 };
1632
17− outputs = [ "out" "dev" ];
33+ nativeBuildInputs = [
34+ pkg-config
35+ meson
36+ ninja
37+ gobject-introspection
38+ ];
39+
40+ buildInputs = [
41+ glib
42+ gobject-introspection
43+ ] ++ lib.optionals stdenv.isDarwin [
44+ ncurses
45+ ];
1846
19− nativeBuildInputs = [ pkg-config meson ninja gobject-introspection ];
20− buildInputs = [ glib gobject-introspection ]
21− ++ lib.optionals stdenv.isDarwin [ which ncurses ];
22− propagatedBuildInputs = [ pycairo cairo ];
47+ propagatedBuildInputs = [
48+ pycairo
49+ cairo
50+ ];
2351
2452 passthru = {
2553 updateScript = gnome3.updateScript {
2654 packageName = pname;
2755 attrPath = "python3.pkgs.${pname}3";
56+ versionPolicy = "odd-unstable";
2857 };
2958 };
3059
3160 meta = with lib; {
3261 homepage = "https://pygobject.readthedocs.io/";
3362 description = "Python bindings for Glib";
34− license = licenses.gpl2;
63+ license = licenses.lgpl21Plus;
3564 maintainers = with maintainers; [ jtojnar ];
3665 platforms = platforms.unix;
3766 };
pkgs/development/python-modules/tappy/default.nixnew file+29
@@ -0,0 +1,29 @@
1+{ lib
2+, buildPythonPackage
3+, pythonOlder
4+, fetchPypi
5+, pytestCheckHook
6+}:
7+
8+buildPythonPackage rec {
9+ pname = "tap.py";
10+ version = "3.0";
11+
12+ disabled = pythonOlder "3.5";
13+
14+ src = fetchPypi {
15+ inherit pname version;
16+ sha256 = "sha256-9e7u6/1k5T0yZhdSu0wohYmjuru5bbPzkaTsKfE1nHA=";
17+ };
18+
19+ checkInputs = [ pytestCheckHook ];
20+
21+ pythonImportsCheck = [ "tap" ];
22+
23+ meta = with lib; {
24+ homepage = "https://github.com/python-tap/tappy";
25+ description = "A set of tools for working with the Test Anything Protocol (TAP) in Python";
26+ license = licenses.bsd2;
27+ maintainers = with maintainers; [ sfrijters ];
28+ };
29+}
pkgs/development/tools/profiling/sysprof/capture.nix+1
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
2525
2626 meta = sysprof.meta // {
2727 description = "Static library for Sysprof capture data generation";
28+ license = lib.licenses.bsd2Patent;
2829 platforms = lib.platforms.all;
2930 };
3031}
pkgs/development/tools/profiling/sysprof/default.nix+15−4
@@ -5,6 +5,7 @@
55, gettext
66, glib
77, gtk3
8+, json-glib
89, itstool
910, libdazzle
1011, libxml2
@@ -20,13 +21,13 @@
2021
2122stdenv.mkDerivation rec {
2223 pname = "sysprof";
23− version = "3.38.1";
24+ version = "3.40.1";
2425
2526 outputs = [ "out" "lib" "dev" ];
2627
2728 src = fetchurl {
2829 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
29− sha256 = "1z2i9187f2jx456l7h07wy8m9a0p7pj3xiv1aji3snq7rjb1lkj0";
30+ sha256 = "0dvlzjwi3a4g37cpyhqpf41f5hypf0gim1jw9wqlv30flbb00l62";
3031 };
3132
3233 nativeBuildInputs = [
@@ -41,7 +42,16 @@ stdenv.mkDerivation rec {
4142 wrapGAppsHook
4243 gnome3.adwaita-icon-theme
4344 ];
44− buildInputs = [ glib gtk3 pango polkit systemd.dev (lib.getLib systemd) libdazzle ];
45+
46+ buildInputs = [
47+ glib
48+ gtk3
49+ json-glib
50+ pango
51+ polkit
52+ systemd
53+ libdazzle
54+ ];
4555
4656 mesonFlags = [
4757 "-Dsystemdunitdir=lib/systemd/system"
@@ -50,6 +60,7 @@ stdenv.mkDerivation rec {
5060 passthru = {
5161 updateScript = gnome3.updateScript {
5262 packageName = pname;
63+ versionPolicy = "odd-unstable";
5364 };
5465 };
5566
@@ -65,6 +76,6 @@ stdenv.mkDerivation rec {
6576 '';
6677 license = licenses.gpl2Plus;
6778 maintainers = teams.gnome.members;
68− platforms = platforms.linux;
79+ platforms = platforms.unix;
6980 };
7081}
pkgs/development/tools/vala-lint/default.nix+6−6
@@ -1,4 +1,5 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchFromGitHub
34, glib
45, meson
@@ -12,13 +13,13 @@
1213
1314stdenv.mkDerivation rec {
1415 pname = "vala-lint-unstable";
15− version = "2020-08-18";
16+ version = "2021-02-17";
1617
1718 src = fetchFromGitHub {
1819 owner = "vala-lang";
1920 repo = "vala-lint";
20− rev = "fc5dd9e95bc61540b404d5bc070c0629903baad9";
21− sha256 = "n6pp6vYGaRF8B3phWp/e9KnpKGf0Op+xGVdT6HHe0rM=";
21+ rev = "5b06cc2341ae7e9f7f8c35c542ef78c36e864c30";
22+ sha256 = "KwJ5sCp9ZrrxIqc6qi2+ZdHBt1esNOO1+uDkS+d9mW8=";
2223 };
2324
2425 nativeBuildInputs = [
@@ -34,8 +35,7 @@ stdenv.mkDerivation rec {
3435 glib
3536 ];
3637
37− # See https://github.com/vala-lang/vala-lint/issues/133
38− doCheck = false;
38+ doCheck = true;
3939
4040 meta = with lib; {
4141 homepage = "https://github.com/vala-lang/vala-lint";
pkgs/tools/admin/gtk-vnc/default.nix+4−12
@@ -1,6 +1,6 @@
1−{ lib, stdenv
1+{ lib
2+, stdenv
23, fetchurl
3−, fetchpatch
44, meson
55, ninja
66, gobject-introspection
@@ -22,23 +22,15 @@
2222
2323stdenv.mkDerivation rec {
2424 pname = "gtk-vnc";
25− version = "1.0.0";
25+ version = "1.2.0";
2626
2727 outputs = [ "out" "bin" "man" "dev" ];
2828
2929 src = fetchurl {
3030 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
31− sha256 = "1060ws037v556rx1qhfrcg02859rscksrzr8fq11himdg4d1y6m8";
31+ sha256 = "0jmr6igyzcj2wmx5v5ywaazvdz3hx6a6rys26yb4l4s71l281bvs";
3232 };
3333
34− patches = [
35− # Fix undeclared gio-unix-2.0 in example program.
36− (fetchpatch {
37− url = "https://gitlab.gnome.org/GNOME/gtk-vnc/commit/8588bc1c8321152ddc5086ca9b2c03a7f511e0d0.patch";
38− sha256 = "0i1iapsbngl1mhnz22dd73mnzk68qc4n51pqdhnm18zqc8pawvh4";
39− })
40− ];
41−
4234 nativeBuildInputs = [
4335 meson
4436 ninja
pkgs/tools/networking/gupnp-tools/default.nix+1
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
4444 passthru = {
4545 updateScript = gnome3.updateScript {
4646 packageName = pname;
47+ versionPolicy = "odd-unstable";
4748 };
4849 };
4950
pkgs/tools/networking/networkmanager/applet/default.nix+1
@@ -75,6 +75,7 @@ stdenv.mkDerivation rec {
7575 updateScript = gnome3.updateScript {
7676 packageName = pname;
7777 attrPath = "networkmanagerapplet";
78+ versionPolicy = "odd-unstable";
7879 };
7980 };
8081
pkgs/tools/networking/networkmanager/fortisslvpn/default.nix+1
@@ -72,6 +72,7 @@ stdenv.mkDerivation rec {
7272 updateScript = gnome3.updateScript {
7373 packageName = pname;
7474 attrPath = "networkmanager-fortisslvpn";
75+ versionPolicy = "odd-unstable";
7576 };
7677 };
7778
pkgs/tools/networking/networkmanager/libnma/default.nix+1
@@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
7777 passthru = {
7878 updateScript = gnome3.updateScript {
7979 packageName = pname;
80+ versionPolicy = "odd-unstable";
8081 };
8182 };
8283
pkgs/tools/networking/networkmanager/openconnect/default.nix+1
@@ -69,6 +69,7 @@ in stdenv.mkDerivation {
6969 updateScript = gnome3.updateScript {
7070 packageName = pname;
7171 attrPath = "networkmanager-openconnect";
72+ versionPolicy = "odd-unstable";
7273 };
7374 };
7475
pkgs/tools/networking/networkmanager/openvpn/default.nix+1
@@ -34,6 +34,7 @@ in stdenv.mkDerivation {
3434 updateScript = gnome3.updateScript {
3535 packageName = pname;
3636 attrPath = "networkmanager-openvpn";
37+ versionPolicy = "odd-unstable";
3738 };
3839 };
3940
pkgs/tools/networking/networkmanager/vpnc/default.nix+1
@@ -38,6 +38,7 @@ in stdenv.mkDerivation {
3838 updateScript = gnome3.updateScript {
3939 packageName = pname;
4040 attrPath = "networkmanager-vpnc";
41+ versionPolicy = "odd-unstable";
4142 };
4243 };
4344
pkgs/tools/text/gtranslator/default.nix+5−3
@@ -9,6 +9,7 @@
99, wrapGAppsHook
1010, libxml2
1111, libgda
12+, libhandy
1213, libsoup
1314, json-glib
1415, gspell
@@ -22,11 +23,11 @@
2223
2324stdenv.mkDerivation rec {
2425 pname = "gtranslator";
25− version = "3.38.0";
26+ version = "40.0";
2627
2728 src = fetchurl {
28− url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
29− sha256 = "282puBoi2SM74Y6Z/VxEj2qwV1nR6UwQWAu4McotdjU=";
29+ url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
30+ sha256 = "0d48nc11z0m91scy21ah56ysxns82zvswx8lglvlkig1vqvblgpc";
3031 };
3132
3233 nativeBuildInputs = [
@@ -46,6 +47,7 @@ stdenv.mkDerivation rec {
4647 libdazzle
4748 gtksourceview4
4849 libgda
50+ libhandy
4951 libsoup
5052 json-glib
5153 gettext
pkgs/top-level/all-packages.nix+24−2
@@ -637,6 +637,8 @@ in
637637
638638 wrapGAppsHook = callPackage ../build-support/setup-hooks/wrap-gapps-hook { };
639639
640+ wrapGAppsHook4 = wrapGAppsHook.override { gtk3 = gtk4; };
641+
640642 wrapGAppsNoGuiHook = wrapGAppsHook.override { isGraphical = false; };
641643
642644 separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
@@ -11670,6 +11672,7 @@ in
1167011672 vala_0_46
1167111673 vala_0_48
1167211674 vala_0_50
11675+ vala_0_52
1167311676 vala;
1167411677
1167511678 vyper = with python3Packages; toPythonApplication vyper;
@@ -14858,6 +14861,10 @@ in
1485814861
1485914862 glibmm = callPackage ../development/libraries/glibmm { };
1486014863
14864+ glibmm_2_68 = callPackage ../development/libraries/glibmm/2.68.nix {
14865+ inherit (darwin.apple_sdk.frameworks) Cocoa;
14866+ };
14867+
1486114868 glib-networking = callPackage ../development/libraries/glib-networking {};
1486214869
1486314870 glib-testing = callPackage ../development/libraries/glib-testing { };
@@ -14878,6 +14885,8 @@ in
1487814885
1487914886 cairomm = callPackage ../development/libraries/cairomm { };
1488014887
14888+ cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { };
14889+
1488114890 pango = callPackage ../development/libraries/pango {
1488214891 harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
1488314892 };
@@ -14890,6 +14899,10 @@ in
1489014899 inherit (darwin.apple_sdk.frameworks) ApplicationServices;
1489114900 };
1489214901
14902+ pangomm_2_48 = callPackage ../development/libraries/pangomm/2.48.nix {
14903+ inherit (darwin.apple_sdk.frameworks) ApplicationServices;
14904+ };
14905+
1489314906 gdata-sharp = callPackage ../development/libraries/gdata-sharp { };
1489414907
1489514908 gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
@@ -14930,6 +14943,7 @@ in
1493014943
1493114944 gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { };
1493214945 gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { };
14946+ gtkmm4 = callPackage ../development/libraries/gtkmm/4.x.nix { };
1493314947
1493414948 gtk_engines = callPackage ../development/libraries/gtk-engines { };
1493514949
@@ -14969,6 +14983,8 @@ in
1496914983
1497014984 gtksourceview4 = callPackage ../development/libraries/gtksourceview/4.x.nix { };
1497114985
14986+ gtksourceview5 = callPackage ../development/libraries/gtksourceview/5.x.nix { };
14987+
1497214988 gtksourceviewmm = callPackage ../development/libraries/gtksourceviewmm { };
1497314989
1497414990 gtksourceviewmm4 = callPackage ../development/libraries/gtksourceviewmm/4.x.nix { };
@@ -16238,7 +16254,10 @@ in
1623816254
1623916255 libroxml = callPackage ../development/libraries/libroxml { };
1624016256
16241− librsvg = callPackage ../development/libraries/librsvg { };
16257+ librsvg = callPackage ../development/libraries/librsvg {
16258+ inherit (darwin) libobjc;
16259+ inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
16260+ };
1624216261
1624316262 librsync = callPackage ../development/libraries/librsync { };
1624416263
@@ -16256,6 +16275,8 @@ in
1625616275
1625716276 libsigcxx12 = callPackage ../development/libraries/libsigcxx/1.2.nix { };
1625816277
16278+ libsigcxx30 = callPackage ../development/libraries/libsigcxx/3.0.nix { };
16279+
1625916280 libsigsegv = callPackage ../development/libraries/libsigsegv { };
1626016281
1626116282 libslirp = callPackage ../development/libraries/libslirp { };
@@ -24035,7 +24056,7 @@ in
2403524056 });
2403624057
2403724058 imagemagickBig = lowPrio (callPackage ../applications/graphics/ImageMagick/7.0.nix {
24038− inherit (darwin.apple_sdk.frameworks) ApplicationServices;
24059+ inherit (darwin.apple_sdk.frameworks) ApplicationServices Foundation;
2403924060 });
2404024061
2404124062 inherit (nodePackages) imapnotify;
@@ -28653,6 +28674,7 @@ in
2865328674 freon = callPackage ../desktops/gnome-3/extensions/freon { };
2865428675 fuzzy-app-search = callPackage ../desktops/gnome-3/extensions/fuzzy-app-search { };
2865528676 gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { };
28677+ hot-edge = callPackage ../desktops/gnome-3/extensions/hot-edge { };
2865628678 icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { };
2865728679 impatience = callPackage ../desktops/gnome-3/extensions/impatience { };
2865828680 material-shell = callPackage ../desktops/gnome-3/extensions/material-shell { };
pkgs/top-level/python-packages.nix+2
@@ -7894,6 +7894,8 @@ in {
78947894
78957895 tailer = callPackage ../development/python-modules/tailer { };
78967896
7897+ tappy = callPackage ../development/python-modules/tappy { };
7898+
78977899 tasklib = callPackage ../development/python-modules/tasklib { };
78987900
78997901 taskw = callPackage ../development/python-modules/taskw { };