From b5d942b84f961a3dda3d2d418dfffe5d27c3dea1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 21 May 2022 16:02:19 +0000 Subject: [PATCH 1/7] =?UTF-8?q?gnome.seahorse:=2041.0=20=E2=86=92=2042.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/seahorse/-/compare/41.0...42.0 --- pkgs/desktops/gnome/apps/seahorse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index 8265636344fc..6387f6caefd5 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 = [ From 275b2f85ec3844ea0f949e5ca8e2e85c5b9a287d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 21 May 2022 16:03:51 +0000 Subject: [PATCH 2/7] =?UTF-8?q?orca:=2042.0=20=E2=86=92=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/orca/-/compare/ORCA_42_0...ORCA_42_1 --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From 2f87de7b08a1de5b8f9c501b03c81bcc1e4d9a7e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 21 May 2022 16:03:54 +0000 Subject: [PATCH 3/7] =?UTF-8?q?shotwell:=200.30.15=20=E2=86=92=200.30.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/shotwell/-/compare/shotwell-0.30.15...shotwell-0.30.16 --- pkgs/applications/graphics/shotwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From e337e4ea5f5563fa3a0d916482ffdcf56e500e57 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 May 2022 11:38:08 +0000 Subject: [PATCH 4/7] =?UTF-8?q?evince:=2042.2=20=E2=86=92=2042.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evince/-/compare/42.2...42.3 --- pkgs/desktops/gnome/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = '' From 9925507b45d51c36065d40529bba9d3d751f18b6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 May 2022 11:39:54 +0000 Subject: [PATCH 5/7] =?UTF-8?q?gupnp-tools:=200.10.2=20=E2=86=92=200.10.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gupnp-tools/-/compare/gupnp-tools-0.10.2...gupnp-tools-0.10.3 --- pkgs/tools/networking/gupnp-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 = [ From e3e91f0c33757126568adba98a3844d1f86bcdbc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 23 May 2022 13:52:20 +0200 Subject: [PATCH 6/7] seahorse: fix missing icons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Recent `wrapGAppsHook` change stopped `gcr` from being added to `XDG_DATA_DIRS`: https://github.com/NixOS/nixpkgs/commit/b1e73fa2e086f1033a33d93524ae2a1781d12b95 But gcr installs icons expected by Seahorse to the hicolor theme so we need to add it back. Also drop adwaita-icon-theme since whether it will be used depends on user’s environment. --- pkgs/desktops/gnome/apps/seahorse/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix index 6387f6caefd5..60b1e2d572ed 100644 --- a/pkgs/desktops/gnome/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -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; From 2d6c4410424e75048144b147cb3e6ad51432fd82 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 24 May 2022 15:46:14 +0000 Subject: [PATCH 7/7] =?UTF-8?q?gnome.gnome-keyring:=2040.0=20=E2=86=92=204?= =?UTF-8?q?2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-keyring/-/compare/40.0...42.1 The systemd-activation support does not appear to me to be ready yet: https://gitlab.gnome.org/GNOME/gnome-keyring/-/merge_requests/35 --- pkgs/desktops/gnome/core/gnome-keyring/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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