diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix index 071c97ad080e..cc87126e8e35 100644 --- a/pkgs/by-name/gv/gvfs/package.nix +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -39,21 +39,18 @@ libnfs, openssh, libsecret, - libgdata, libmsgraph, python3, gsettings-desktop-schemas, - googleSupport ? false, # dependency on vulnerable libsoup versions }: -assert googleSupport -> gnomeSupport; stdenv.mkDerivation (finalAttrs: { pname = "gvfs"; - version = "1.58.4"; + version = "1.60.0"; src = fetchurl { url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz"; - hash = "sha256-5xJL7HJOJlrQ7gC6on2NUVzx3dzxAmOL5nueJZybBA0="; + hash = "sha256-ZIJz8GnpLH48ATuSFI6CyQHwgETis7FMbPvVImn2tkY="; }; patches = [ @@ -109,9 +106,6 @@ stdenv.mkDerivation (finalAttrs: { gnome-online-accounts libsecret libmsgraph - ] - ++ lib.optionals googleSupport [ - libgdata ]; mesonFlags = [ @@ -136,9 +130,6 @@ stdenv.mkDerivation (finalAttrs: { "-Dkeyring=false" "-Donedrive=false" ] - ++ lib.optionals (!googleSupport) [ - "-Dgoogle=false" - ] ++ lib.optionals (avahi == null) [ "-Ddnssd=false" ]