Merge pull request #195447 from bobby285271/pantheon

Pantheon 7 updates 2022-10-10

pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix

···
 
 stdenvNoCC.mkDerivation rec {
   pname = "elementary-gtk-theme";
-  version = "7.0.0";
+  version = "7.0.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "stylesheet";
     rev = version;
-    sha256 = "sha256-ZnQ54ktH0/ZyFH6c180YzbkK/TyIDziiwAXi/zqHpe4=";
+    sha256 = "sha256-KUo9IbB10JRgFrn6I5y4+34PEihuwp78b+YsX2Wqip8=";
   };
 
   nativeBuildInputs = [

pkgs/desktops/pantheon/granite/7/default.nix

···
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , python3
 , meson
···
 
 stdenv.mkDerivation rec {
   pname = "granite";
-  version = "7.0.0";
+  version = "7.1.0";
 
   outputs = [ "out" "dev" ];
 
···
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-fuyjQDH3C8qRYuAfQDDeW3aSWVTLtGzMAjcuAHCB1Zw=";
+    sha256 = "sha256-tdZSiIK+BW8uhbRxLUcrGQt71jRfVLOTgFNOqeLK6ig=";
   };
-
-  patches = [
-    # MessageDialog: Fix large height bug
-    # https://github.com/elementary/granite/pull/616
-    (fetchpatch {
-      url = "https://github.com/elementary/granite/commit/28e9b60fc8257b2d8e76412518e96a7e03efc6e4.patch";
-      sha256 = "sha256-3VH5bhX8tuNR3Iabz3JjkLfVVyO5eSnYacFgdqurU0A=";
-      excludes = [ "data/granite.appdata.xml.in" ];
-    })
-  ];
 
   nativeBuildInputs = [
     gettext