From c4d7d9be22a93a5afba10a7a722dd764986151df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 9 Feb 2020 01:13:56 +0100 Subject: [PATCH] epiphany: 3.34.4 -> 3.36.0 --- pkgs/desktops/gnome-3/core/epiphany/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 0272bd8e6c11..22793c6e7dc4 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -3,6 +3,7 @@ , ninja , gettext , fetchurl +, fetchpatch , pkgconfig , gtk3 , glib @@ -35,13 +36,22 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "3.34.4"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13ar3s40cds1rplwbzx0fzigf120w0rydiv05r3k6zpc0zy91qb0"; + sha256 = "1xjn6jk4dx2kl2llalydcyvibnpwjahp9z3210pflyy4k68pfw6l"; }; + patches = [ + # Fix downloading files + # https://gitlab.gnome.org/GNOME/epiphany/issues/1127 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/epiphany/commit/8682a084bab7e758a9b8efe1deaf0cb8d55fcf44.patch"; + sha256 = "bep+Q8Wpu84KA13a5T3JCz8nyeC13HT/QkMKvWT6vLk="; + }) + ]; + # Tests need an X display mesonFlags = [ "-Dunit_tests=disabled"