summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2022-10-02 20:07:03 +0000
committerJan Tojnar <jtojnar@gmail.com>2022-10-11 18:52:35 +0200
commitff5713f2f93dfce22cff8077fdc90462f70a2f44 (patch)
treec1472e76165be21b44439b2033650dcbf21c9810 /pkgs/desktops
parentdcd9db4408ae0c2cbdd265f7f35ca718865f5fb4 (diff)
downloadnixpkgs-ff5713f2f93dfce22cff8077fdc90462f70a2f44.tar
nixpkgs-ff5713f2f93dfce22cff8077fdc90462f70a2f44.tar.gz
nixpkgs-ff5713f2f93dfce22cff8077fdc90462f70a2f44.tar.bz2
nixpkgs-ff5713f2f93dfce22cff8077fdc90462f70a2f44.tar.lz
nixpkgs-ff5713f2f93dfce22cff8077fdc90462f70a2f44.tar.xz
nixpkgs-ff5713f2f93dfce22cff8077fdc90462f70a2f44.tar.zst
nixpkgs-ff5713f2f93dfce22cff8077fdc90462f70a2f44.zip
gnome.gnome-panel: 3.44.0 → 3.46.0
https://gitlab.gnome.org/GNOME/gnome-panel/-/compare/3.44.0...3.46.0

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome/misc/gnome-panel/default.nix16
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix
index 0b107f23d78..503fc34bae8 100644
--- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix
@@ -1,12 +1,11 @@
 { stdenv
 , lib
 , fetchurl
-, fetchpatch
 , autoreconfHook
 , dconf
 , evolution-data-server
 , gdm
-, geocode-glib
+, geocode-glib_2
 , gettext
 , glib
 , gnome-desktop
@@ -26,13 +25,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-panel";
-  version = "3.44.0";
+  version = "3.46.0";
 
   outputs = [ "out" "dev" "man" ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-mWVfddAxh2wTDtI8TaIsCZ57zEBIsCVaPDo7vHh7Mao=";
+    hash = "sha256-zsehG3DFJLXo121Nfk2DXuYHq9outC9N92GeYusGrrE=";
   };
 
   patches = [
@@ -40,13 +39,6 @@ stdenv.mkDerivation rec {
     # instead of gnome-panel’s libdir so that the NixOS module can make gnome-panel
     # load modules from other packages as well.
     ./modulesdir-env-var.patch
-
-    # Add missing geocode-glib-1.0 dependency
-    # https://gitlab.gnome.org/GNOME/gnome-panel/-/merge_requests/49
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-panel/-/commit/f58a43ec4649a25f1a762b36e1401b81cd2b214b.patch";
-      sha256 = "sha256-DFqaNUjkLh4xd81qgQpl+568eUZeWyF8LxdZoTgMfCQ=";
-    })
   ];
 
   # make .desktop Exec absolute
@@ -79,7 +71,7 @@ stdenv.mkDerivation rec {
     dconf
     evolution-data-server
     gdm
-    geocode-glib
+    geocode-glib_2
     glib
     gnome-desktop
     gnome-menus