Gnome 3.36.2 #86661
Merged
Gnome 3.36.2 #86661
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ofborg
bot
added
6.topic: GNOME
|
VTE: https://gitlab.gnome.org/GNOME/vte/-/compare/0.60.1...0.60.2 Changes look mostly okay. Things I need to check:
|
jonringer
approved these changes
May 3, 2020
There was a problem hiding this comment.
looking through the logs, I don't see any gnome3 packages causing any regressions:
https://github.com/NixOS/nixpkgs/pull/86661
2 package marked as broken and skipped:
linuxPackages_hardkernel_4_14.virtualbox linuxPackages_hardkernel_latest.virtualbox
1 package blacklisted:
tests.nixos-functions.nixosTest-test
25 package failed to build:
almanah deepin.dde-file-manager deepin.deepin-terminal deepin.startdde linuxPackages-libre.virtualbox linuxPackages.virtualbox linuxPackages_4_14.virtualbox linuxPackages_4_19.virtualbox linuxPackages_4_4.virtualbox linuxPackages_4_9.virtualbox linuxPackages_5_5.virtualbox linuxPackages_5_6.virtualbox linuxPackages_hardened.virtualbox linuxPackages_latest-libre.virtualbox linuxPackages_latest_hardened.virtualbox linuxPackages_latest_xen_dom0.virtualbox linuxPackages_latest_xen_dom0_hardened.virtualbox linuxPackages_testing_bcachefs.virtualbox linuxPackages_xen_dom0.virtualbox linuxPackages_xen_dom0_hardened.virtualbox rpm-ostree virtualbox virtualboxHardened virtualboxHeadless virtualboxWithExtpack
145 package built:
adapta-gtk-theme aqemu calls chrome-gnome-shell cloud-init cloud-utils deja-dup discover dropbox-cli elementary-planner empathy evolution-data-server flatpak flatpak-builder folks geany-with-vte gjs gnome-builder gnome-photos gnome-user-docs gnome3.accerciser gnome3.anjuta gnome3.bijiben gnome3.cheese gnome3.dconf-editor gnome3.devhelp gnome3.eog gnome3.evolution gnome3.file-roller gnome3.four-in-a-row gnome3.geary gnome3.gedit gnome3.gnome-applets gnome3.gnome-books gnome3.gnome-boxes gnome3.gnome-calendar gnome3.gnome-characters gnome3.gnome-color-manager gnome3.gnome-contacts gnome3.gnome-control-center gnome3.gnome-disk-utility gnome3.gnome-documents gnome3.gnome-flashback gnome3.gnome-getting-started-docs gnome3.gnome-initial-setup gnome3.gnome-klotski gnome3.gnome-mahjongg gnome3.gnome-maps gnome3.gnome-music gnome3.gnome-panel gnome3.gnome-session gnome3.gnome-settings-daemon gnome3.gnome-shell gnome3.gnome-software gnome3.gnome-sound-recorder gnome3.gnome-taquin gnome3.gnome-terminal gnome3.gnome-tetravex gnome3.gnome-todo gnome3.gnome-tweaks gnome3.gnome-user-share gnome3.gnome-weather gnome3.gpaste gnome3.iagno gnome3.mutter pantheon.mutter gnome3.nautilus gnome3.nautilus-python nemiver orca gnome3.polari gnome3.pomodoro gnome3.quadrapassel simple-scan gnome3.sushi gnome3.totem tracker-miners gnome3.vinagre vte gnomeExtensions.drop-down-terminal gnomeExtensions.gsconnect gtkd gtkpod guake haskellPackages.gi-ostree haskellPackages.gi-vte haskellPackages.termonad libguestfs libguestfs-with-appliance lxterminal malcontent-ui mate.mate-terminal minishift mlterm monitor open-watcom-bin ostree out-of-tree pantheon.appcenter pantheon.elementary-calendar pantheon.elementary-code pantheon.elementary-greeter pantheon.elementary-gsettings-schemas pantheon.elementary-session-settings pantheon.elementary-terminal pantheon.extra-elementary-contracts pantheon.gala pantheon.sideload pantheon.switchboard-plug-pantheon-shell pantheon.switchboard-with-plugs pantheon.wingpanel pantheon.wingpanel-applications-menu pantheon.wingpanel-indicator-bluetooth pantheon.wingpanel-indicator-datetime pantheon.wingpanel-indicator-keyboard pantheon.wingpanel-indicator-network pantheon.wingpanel-indicator-nightlight pantheon.wingpanel-indicator-notifications pantheon.wingpanel-indicator-power pantheon.wingpanel-indicator-session pantheon.wingpanel-indicator-sound pantheon.wingpanel-with-indicators python27Packages.guestfs python37Packages.guestfs python38Packages.guestfs qemu qemu-utils qemu_kvm qemu_test qtemu roxterm sakura stupidterm terminator termite termonad-with-packages tilda tilix vagrant virt-manager virt-viewer xdg-desktop-portal xdg-desktop-portal-gtk xfce.terminal xmonad_log_applet
|
|
Updated the comment above, we should probably fix the Also tried to make the libheif support in eog work but without success: Modules are trying to install to gdk-pixbuf prefix, But the loaders.cache file is not generated/installed so the setup hook cannot pick it up. diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index db15cf2555c..2d1d6197bee 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -1,5 +1,5 @@
{ fetchurl, stdenv, meson, ninja, gettext, itstool, pkgconfig, libxml2, libjpeg, libpeas, gnome3
-, gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk-pixbuf, exempi
+, gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk-pixbuf, exempi, libheif
, shared-mime-info, wrapGAppsHook, librsvg, libexif, gobject-introspection, python3 }:
let
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
buildInputs = [
- libjpeg gtk3 gdk-pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi
+ libjpeg gtk3 gdk-pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi libheif
gsettings-desktop-schemas shared-mime-info adwaita-icon-theme
];
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 82fbbc967ef..92b5505c5a8 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -87,7 +87,7 @@ in stdenv.mkDerivation rec {
# The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
inherit doCheck;
- passthru = {
+ passthru = rec {
updateScript = gnome3.updateScript {
packageName = pname;
};
@@ -96,8 +96,9 @@ in stdenv.mkDerivation rec {
installedTests = nixosTests.installed-tests.gdk-pixbuf;
};
- # gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc
- moduleDir = "lib/gdk-pixbuf-2.0/2.10.0/loaders";
+ # gdk_pixbuf_binarydir variable from gdk-pixbuf-2.0.pc
+ binaryDir = "lib/gdk-pixbuf-2.0/2.10.0";
+ moduleDir = "${binaryDir}/loaders";
};
meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libheif/default.nix b/pkgs/development/libraries/libheif/default.nix
index b5717034da0..059615794c9 100644
--- a/pkgs/development/libraries/libheif/default.nix
+++ b/pkgs/development/libraries/libheif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libde265, x265, libpng, libjpeg, gdk-pixbuf }:
stdenv.mkDerivation rec {
pname = "libheif";
@@ -14,10 +14,13 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ autoreconfHook pkgconfig ];
- buildInputs = [ libde265 x265 libpng libjpeg ];
+ buildInputs = [ libde265 x265 libpng libjpeg gdk-pixbuf ];
enableParallelBuilding = true;
+ # Fix installation path for gdk-pixbuf module
+ PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_BINARYDIR = "${placeholder "out"}/${gdk-pixbuf.binaryDir}";
+
meta = {
homepage = "http://www.libheif.org/";
description = "ISO/IEC 23008-12:2017 HEIF image file format decoder and encoder";
|
|
Geary MR: https://gitlab.gnome.org/GNOME/geary/merge_requests/511 But if it works, we can go without it for now. |
|
Notifications seems to work at least. The patch doesn't apply cleanly so I'd also say lets get this merged. (btw, seems like you've really mastered the art of getting patches accepted :)) |
jtojnar
approved these changes
May 6, 2020
|
ugh, managed to do a squash commit :( |
|
Does this affect us? https://mail.gnome.org/archives/distributor-list/2020-May/msg00000.html |
|
Not yet, we haven't upgrade gdm yet. I would guess it won't be a problem, but absolutely something to watch out for. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
News
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)