summary refs log tree commit diff
path: root/pkgs/desktops/gnome/core
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-12-18 00:02:05 +0000
committerGitHub <noreply@github.com>2021-12-18 00:02:05 +0000
commitd1e6365b219acae85337bff1d928a04434b89e19 (patch)
tree7dd27f863b81722e5ae3415cf1950ce992555c8e /pkgs/desktops/gnome/core
parentf8d75f32579d01f750bf6b11496d3972a4943075 (diff)
parent084faede55cebd0476ea6f23cadffd7b99494e49 (diff)
downloadnixpkgs-d1e6365b219acae85337bff1d928a04434b89e19.tar
nixpkgs-d1e6365b219acae85337bff1d928a04434b89e19.tar.gz
nixpkgs-d1e6365b219acae85337bff1d928a04434b89e19.tar.bz2
nixpkgs-d1e6365b219acae85337bff1d928a04434b89e19.tar.lz
nixpkgs-d1e6365b219acae85337bff1d928a04434b89e19.tar.xz
nixpkgs-d1e6365b219acae85337bff1d928a04434b89e19.tar.zst
nixpkgs-d1e6365b219acae85337bff1d928a04434b89e19.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/desktops/gnome/core')
-rw-r--r--pkgs/desktops/gnome/core/epiphany/default.nix16
1 files changed, 5 insertions, 11 deletions
diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix
index 6f996552064..78098b4ad94 100644
--- a/pkgs/desktops/gnome/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome/core/epiphany/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , meson
 , ninja
 , gettext
@@ -40,21 +41,14 @@
 
 stdenv.mkDerivation rec {
   pname = "epiphany";
-  version = "41.0";
+  version = "41.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "s50YJUkllbC3TF1qZoaoV/lBnfpMAvgBPCl7yHDibdA=";
+    sha256 = "Ud5KGB+nxKEs3DDMsWQ2ElwaFt+av44/pTP8gb8Q60w=";
   };
 
-  patches = [
-    # tab-view: Update close button position on startup
-    # https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1025
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/epiphany/-/commit/6e9d6d3cf7fa7ddf21a70e9816a5cd4767a79523.patch";
-      sha256 = "sha256-lBVliGCIKwTvsYnWjAcmJxhTg1HS/2x4wlOh+4sx/xQ=";
-    })
-  ] ++ lib.optionals withPantheon [
+  patches = lib.optionals withPantheon [
     # Pantheon specific patches for epiphany
     # https://github.com/elementary/browser
     #