From 89f5891e166e73693d98c14c9dcdc0f80610b35c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Mar 2023 18:36:16 +0000 Subject: epiphany: 44.rc → 44.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/44.rc...44.0 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/epiphany/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index 178eb444f81a1..436c3ae13913a 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -4,7 +4,6 @@ , ninja , gettext , fetchurl -, fetchpatch2 , pkg-config , gtk4 , glib @@ -37,21 +36,13 @@ stdenv.mkDerivation rec { pname = "epiphany"; - version = "44.rc"; + version = "44.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "33X7U1yAQbzvhNZSWGfVEjw58MaIUDxGBhTNs3Tp+Sk="; + sha256 = "qr3J3oDECQc2duAOFbqXGHcV5LhLx3b+htuG0PgUC7E="; }; - patches = [ - # Fix compatibility with WebkitGTk 2.39.91 - (fetchpatch2 { - url = "https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1295.patch"; - hash = "sha256-xlgGaAzMYgwSty992EKWK5emkyZxyLoCw/HI+Uz74go="; - }) - ]; - nativeBuildInputs = [ desktop-file-utils gettext @@ -97,8 +88,8 @@ stdenv.mkDerivation rec { # Tests need an X display mesonFlags = [ "-Dunit_tests=disabled" - ] ++ lib.optionals (!withPantheon) [ - "-Dgranite=disabled" + ] ++ lib.optionals withPantheon [ + "-Dgranite=enabled" ]; passthru = { -- cgit 1.4.1