diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 098d330f004a..9720b88be870 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.30.15"; + version = "0.30.16"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-OlKtYLEC2g31902wMcRdTM8mNRPJVGFu4WZL9PTpvck="; + sha256 = "sha256-yYgs+9rTA8uBYbFJrLtMYX++fKn2q24i0XTiRH51GPo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 63923188db7b..b2c34a883510 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -34,13 +34,13 @@ buildPythonApplication rec { pname = "orca"; - version = "42.0"; + version = "42.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "LCUXmrQbJgsY8f+Jm+uv5olDi0nf/SEd78l2olCT9zo="; + sha256 = "6p6dLehwg4ewUqe+FqXmnOqfZ2jfrrRee9meRmNxYt4="; }; patches = [ diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index 8265636344fc..60b1e2d572ed 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "seahorse"; - version = "41.0"; + version = "42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-5u7AnoEESClfVH8YwdV3K2XD7cHZ5aJZXxC13eaJKfU="; + hash = "sha256-xQys6/jeen4uXx2uC5gjIRR0Epar6NVD45I9YqFT1jA="; }; nativeBuildInputs = [ @@ -51,7 +51,6 @@ stdenv.mkDerivation rec { gcr gsettings-desktop-schemas gnupg - gnome.adwaita-icon-theme gpgme libsecret avahi @@ -78,6 +77,13 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR ''; + preFixup = '' + gappsWrapperArgs+=( + # Pick up icons from Gcr + --prefix XDG_DATA_DIRS : "${gcr}/share" + ) + ''; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index cda0abaf2f75..8f5a81f0bf55 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "42.2"; + version = "42.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "/3+B8wjPjUlW7Zf7ckp+SUSMIUvuq5mIEu+e+7ON+K4="; + sha256 = "Sa7PhFyUbJbbF7qJ11yAAsWuiWP1BKmwYm0SZ1kUZF4="; }; postPatch = '' diff --git a/pkgs/desktops/gnome/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix index afbec6f8c5d1..22a94de5e84d 100644 --- a/pkgs/desktops/gnome/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -10,6 +10,7 @@ , libxslt , gettext , gcr +, autoreconfHook , libcap_ng , libselinux , p11-kit @@ -22,19 +23,21 @@ stdenv.mkDerivation rec { pname = "gnome-keyring"; - version = "40.0"; + version = "42.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "0cdrlcw814zayhvlaxqs1sm9bqlfijlp22dzzd0g5zg2isq4vlm3"; + sha256 = "x/TQQMx2prf+Z+CO+RBpEcPIDUD8iMv8jiaEpMlG4+Y="; }; nativeBuildInputs = [ pkg-config gettext libxslt + # Upstream uses ancient autotools to pre-generate the scripts. + autoreconfHook docbook-xsl-nons docbook_xml_dtd_43 wrapGAppsHook diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index c29d2c501df8..967bb66256dc 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "gupnp-tools"; - version = "0.10.2"; + version = "0.10.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "beSe9LN1uKFk90t2YWixGE4NKBlrawek9TQfCN/YXWw="; + sha256 = "RX9Nkjk1sHhBXNK6iNeNtgB5tyWSa37hBuRWXv4yBN4="; }; nativeBuildInputs = [