about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-04-27 15:57:05 +0000
committerBobby Rong <rjl931189261@126.com>2023-04-29 21:54:24 +0800
commit30faf0ce3f886ca0e0867d4ffe0e9bed96290be1 (patch)
tree98eb4c7f6e54f961d424c8f87fad9e75c3738625 /pkgs/desktops
parentd6b863fd9b7bb962e6f9fdf292419a775e772891 (diff)
downloadnixlib-30faf0ce3f886ca0e0867d4ffe0e9bed96290be1.tar
nixlib-30faf0ce3f886ca0e0867d4ffe0e9bed96290be1.tar.gz
nixlib-30faf0ce3f886ca0e0867d4ffe0e9bed96290be1.tar.bz2
nixlib-30faf0ce3f886ca0e0867d4ffe0e9bed96290be1.tar.lz
nixlib-30faf0ce3f886ca0e0867d4ffe0e9bed96290be1.tar.xz
nixlib-30faf0ce3f886ca0e0867d4ffe0e9bed96290be1.tar.zst
nixlib-30faf0ce3f886ca0e0867d4ffe0e9bed96290be1.zip
gnome.gnome-shell: 44.0 → 44.1
https://gitlab.gnome.org/GNOME/gnome-shell/-/compare/44.0...44.1
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome/core/gnome-shell/default.nix19
1 files changed, 2 insertions, 17 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix
index 8421d8ed04bf..e47684412765 100644
--- a/pkgs/desktops/gnome/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix
@@ -67,13 +67,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gnome-shell";
-  version = "44.0";
+  version = "44.1";
 
   outputs = [ "out" "devdoc" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "MxCtwd1OIQmY1Z84cbwx9+BJFUKNnO2IwqZrKwXWwAo=";
+    sha256 = "C/vkOU0mdiUVTQjQFGe9vZnoFXUS/I30XVwC3bdVHKY=";
   };
 
   patches = [
@@ -104,14 +104,6 @@ stdenv.mkDerivation rec {
       url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/9a647c460b651aaec0b8a21f046cc289c1999416/f/0001-gdm-Work-around-failing-fingerprint-auth.patch";
       sha256 = "pFvZli3TilUt6YwdZztpB8Xq7O60XfuWUuPMMVSpqLw=";
     })
-
-    # Logout/reboot/poweroff timeout leaves the session in a broken state
-    # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6506
-    # Should be part of 44.1
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/5766d4111ac065b37417bedcc1b998ab6bee5514.patch";
-      sha256 = "d9oEzRnVbaFeCaBFhfLnW/Z8FzyQ7J8L7eAQe91133k=";
-    })
   ];
 
   nativeBuildInputs = [
@@ -194,13 +186,6 @@ stdenv.mkDerivation rec {
     # We can generate it ourselves.
     rm -f man/gnome-shell.1
     rm data/theme/gnome-shell.css
-
-    # Build fails with -Dgtk_doc=true
-    # https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6486
-    # element include: XInclude error : could not load xxx, and no fallback was found
-    substituteInPlace docs/reference/shell/shell-docs.sgml \
-      --replace '<xi:include href="xml/shell-embedded-window.xml"/>' ' ' \
-      --replace '<xi:include href="xml/shell-gtk-embed.xml"/>' ' '
   '';
 
   postInstall = ''