From 077052e040ce39ac1af8ae7f80d5d8c104b04d5d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 22 Apr 2023 02:53:04 +0000 Subject: [PATCH 1/7] =?UTF-8?q?gnome.gnome-control-center:=2044.0=20?= =?UTF-8?q?=E2=86=92=2044.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/44.0...44.1 --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index f61c49fe4cf0..5a2a3e2409eb 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -64,11 +64,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-vb+rTPI9BXNAltsfn2+sfu0/y52jK/Sx8m7ToE5avGY="; + sha256 = "sha256-er02UBjihnne9gpezTBJ2w+4XebaSaltrdIfuo2wAuc="; }; patches = [ From 611e58030ce5c93cd54cfadf03ab917ced2c72af Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 22 Apr 2023 17:39:05 +0800 Subject: [PATCH 2/7] gnome.gnome-control-center: Re-apply fix for hardcode usermod To keep this consistent with accountsservice and budgie-control-center, assuming it has no harm. https://github.com/NixOS/nixpkgs/pull/216737/files#r1109247859 --- .../gnome/core/gnome-control-center/default.nix | 3 ++- .../gnome/core/gnome-control-center/paths.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 5a2a3e2409eb..ac623014e831 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -49,6 +49,7 @@ , polkit , python3 , samba +, shadow , shared-mime-info , sound-theme-freedesktop , tracker @@ -75,7 +76,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./paths.patch; gcm = gnome-color-manager; - inherit glibc libgnomekbd tzdata; + inherit glibc libgnomekbd tzdata shadow; inherit cups networkmanagerapplet; }) ]; diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index 565d6ecdef0f..a1852811d400 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -166,6 +166,19 @@ index 86f53d4fc..0b052856f 100644 argv[1] = NULL; envp = g_get_environ (); +diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c +index 83d4cd091..e8784c722 100644 +--- a/panels/user-accounts/user-utils.c ++++ b/panels/user-accounts/user-utils.c +@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username, + * future, so it would be nice to have some official way for this + * instead of relying on the current "--login" implementation. + */ +- argv[0] = "/usr/sbin/usermod"; ++ argv[0] = "@shadow@/bin/usermod"; + argv[1] = "--login"; + argv[2] = data->username; + argv[3] = "--"; diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c index 9cb92007a..84d2f0fa3 100644 --- a/tests/datetime/test-endianess.c From 894123d8e2fdf929c85a2c8ac0d83405ae8aebe8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 22 Apr 2023 02:53:47 +0000 Subject: [PATCH 3/7] =?UTF-8?q?gnome.gnome-maps:=2044.0=20=E2=86=92=2044.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-maps/-/compare/v44.0...v44.1 --- pkgs/desktops/gnome/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 9ec1e46de36e..7bbe0c331e2e 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-maps"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-YAPrc92f0mm0qRvtm/A+6askDFEk7tq/KL4io/77pZU="; + sha256 = "sha256-tmeG6mr/kRH3WDVu4qEV9jR9Q3lTt77Kq+FDORnzGf8="; }; doCheck = true; From 6d98c26d17d80033ea38d97530b64ba5e58df74e Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 22 Apr 2023 02:54:33 +0000 Subject: [PATCH 4/7] =?UTF-8?q?gnome.gnome-settings-daemon:=2044.0=20?= =?UTF-8?q?=E2=86=92=2044.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/compare/44.0...44.1 --- pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index d93384f9b9f1..a06a04b908fc 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -12,7 +12,6 @@ , glib , libnotify , libgnomekbd -, lcms2 , libpulseaudio , alsa-lib , libcanberra-gtk3 @@ -42,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "tBetocE0KozymDfs8t7Jvc23VCNbGhYbZDXD0R8hCZk="; + sha256 = "EmU7ctgfFRMApH1wCslBCsG8zjjoPxvdGc3tKTKUOYk="; }; patches = [ @@ -84,7 +83,6 @@ stdenv.mkDerivation rec { libnotify libgnomekbd # for org.gnome.libgnomekbd.keyboard schema gnome-desktop - lcms2 libpulseaudio alsa-lib libcanberra-gtk3 From 467e01d3027ed29df11e57c79e0e0cd20273947b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 22 Apr 2023 02:54:53 +0000 Subject: [PATCH 5/7] =?UTF-8?q?gnome.gnome-software:=2044.0=20=E2=86=92=20?= =?UTF-8?q?44.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-software/-/compare/44.0...44.1 --- pkgs/desktops/gnome/core/gnome-software/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 6302a5d8a2c4..c12e28945fc4 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -45,11 +45,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "YZcZ+VKeC7Ha0w+tu3gNex2ZlAptsfcd9RvHNzQYMK8="; + sha256 = "ncZVFRLPCibQPg159JSHCmkW1DwU2CGZxDoR2cwK1ao="; }; patches = [ From 8afca67ad57691b3bb1382f768dc50711f2d6fc9 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 22 Apr 2023 03:04:48 +0000 Subject: [PATCH 6/7] =?UTF-8?q?xdg-desktop-portal-gnome:=2044.0=20?= =?UTF-8?q?=E2=86=92=2044.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome/-/compare/44.0...44.1 --- .../libraries/xdg-desktop-portal-gnome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix index 3848f1cc953b..766f944f15a1 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gnome"; - version = "44.0"; + version = "44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "VQEeV/ZLfK8IN0Be+gNKM2uec965+E5cFMyfeo4OezQ="; + sha256 = "NoLFRsgZIqW6adYthvacDCaxfJCWgj9YFJ0LVbvw7ts="; }; nativeBuildInputs = [ From 6d001ab31a7fc1b2bd9d8d155d253928dada0b59 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 22 Apr 2023 19:51:38 +0800 Subject: [PATCH 7/7] gnome.nautilus: Backport crash fix for search after copy/cut https://github.com/NixOS/nixpkgs/pull/227595#pullrequestreview-1396700711 --- pkgs/desktops/gnome/core/nautilus/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/desktops/gnome/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix index 11dac0484ba2..b0832180b38d 100644 --- a/pkgs/desktops/gnome/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch2 , meson , ninja , pkg-config @@ -56,6 +57,14 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; inherit tracker; }) + + # Fix crash during search after "copy"/"cut" action selection + # Can be removed in 44.1 + # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1155 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/nautilus/-/commit/f0f6c372802aabe7ba098d3af1f81cbc03eba27b.patch"; + sha256 = "mlrLvNgDQvi4maa81ozu6DsDBVx9NrsgYzWN+oSboVQ="; + }) ]; nativeBuildInputs = [