about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2019-09-06 16:55:11 +0200
committerJan Tojnar <jtojnar@gmail.com>2019-09-06 16:55:11 +0200
commitf9237f315264a0ccb8b50ff4fa6ff456239e4dc1 (patch)
tree4c7212dd0f5244a3f09b8dcd5abca15737cffedf /pkgs/desktops
parentcdf426488b5dc3a7c051d7ad1c90c07dc0c3a89f (diff)
parent4a1189e0abdbe26e34fc05555cf49c25583dfe3d (diff)
downloadnixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar
nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.gz
nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.bz2
nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.lz
nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.xz
nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.tar.zst
nixlib-f9237f315264a0ccb8b50ff4fa6ff456239e4dc1.zip
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/gnome-3/misc/gitg/default.nix12
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix
index 94703f375b21..94418849b987 100644
--- a/pkgs/desktops/gnome-3/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix
@@ -30,21 +30,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gitg";
-  version = "3.32.0";
+  version = "3.32.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "1wzsv7bh0a2w70f938hkpzbb9xkyrp3bil65c0q3yf2v72nbbn81";
+    sha256 = "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914";
   };
 
-  patches = [
-    # https://gitlab.gnome.org/GNOME/gitg/issues/213
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gitg/merge_requests/83.patch";
-      sha256 = "1f7wx1d3k5pnp8zbrqssip57b9jxn3hc7a83psm7fny970qmd18z";
-    })
-  ];
-
   postPatch = ''
     chmod +x meson_post_install.py
     patchShebangs meson_post_install.py