Unverified Commit 4e9f92ab authored by maxine's avatar maxine Committed by GitHub
Browse files

Merge pull request #227595 from bobby285271/upd/gnome

parents 9ea57a7a 6d001ab3

pkgs/desktops/gnome/apps/gnome-maps/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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;

pkgs/desktops/gnome/core/gnome-control-center/default.nix

+4 −3
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
, polkit

, python3

, samba

, shadow

, shared-mime-info

, sound-theme-freedesktop

, tracker
@@ -64,18 +65,18 @@ 


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 = [

    (substituteAll {

      src = ./paths.patch;

      gcm = gnome-color-manager;

      inherit glibc libgnomekbd tzdata;

      inherit glibc libgnomekbd tzdata shadow;

      inherit cups networkmanagerapplet;

    })

  ];

pkgs/desktops/gnome/core/gnome-control-center/paths.patch

+13 −0
Original line number Diff line number Diff line
@@ -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

pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix

+2 −4
Original line number Diff line number Diff line
@@ -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

pkgs/desktops/gnome/core/gnome-software/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [