summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2022-10-11 09:56:06 +0800
committerBobby Rong <rjl931189261@126.com>2022-10-11 09:56:06 +0800
commitd0f8be673df344c3c9530223288cb403540b1e13 (patch)
treeb12caca1ae461766a201117f64469c739b24e05f
parentc5924154f000e6306030300592f4282949b2db6c (diff)
downloadnixpkgs-d0f8be673df344c3c9530223288cb403540b1e13.tar
nixpkgs-d0f8be673df344c3c9530223288cb403540b1e13.tar.gz
nixpkgs-d0f8be673df344c3c9530223288cb403540b1e13.tar.bz2
nixpkgs-d0f8be673df344c3c9530223288cb403540b1e13.tar.lz
nixpkgs-d0f8be673df344c3c9530223288cb403540b1e13.tar.xz
nixpkgs-d0f8be673df344c3c9530223288cb403540b1e13.tar.zst
nixpkgs-d0f8be673df344c3c9530223288cb403540b1e13.zip
pantheon.granite7: 7.0.0 -> 7.1.0
-rw-r--r--pkgs/desktops/pantheon/granite/7/default.nix15
1 files changed, 2 insertions, 13 deletions
diff --git a/pkgs/desktops/pantheon/granite/7/default.nix b/pkgs/desktops/pantheon/granite/7/default.nix
index c9737b9c1a4..4ba07a25460 100644
--- a/pkgs/desktops/pantheon/granite/7/default.nix
+++ b/pkgs/desktops/pantheon/granite/7/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , nix-update-script
 , python3
 , meson
@@ -19,7 +18,7 @@
 
 stdenv.mkDerivation rec {
   pname = "granite";
-  version = "7.0.0";
+  version = "7.1.0";
 
   outputs = [ "out" "dev" ];
 
@@ -27,19 +26,9 @@ stdenv.mkDerivation rec {
     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
     gobject-introspection