From 00269f660c4da075bd931555845161cafc5d6758 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 3 Oct 2017 03:16:25 +0200 Subject: [PATCH] =?UTF-8?q?gvfs:=201.30.1=20=E2=86=92=201.34.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bash completions were removed upstream because gvfs is deprecated in favour of glib’s gio . https://bugzilla.gnome.org/show_bug.cgi?id=769378 --- pkgs/development/libraries/gvfs/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 6eb341d66bc..78f507ca146 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, libtool , glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit -, libgphoto2, avahi, libarchive, fuse, libcdio +, libgphoto2, avahi, libarchive, fuse, libcdio, file, bzip2, lzma , libxml2, libxslt, docbook_xsl, samba, libmtp , gnomeSupport ? false, gnome, makeWrapper }: let - ver_maj = "1.30"; + ver_maj = "1.34"; version = "${ver_maj}.1"; in stdenv.mkDerivation rec { @@ -13,21 +13,21 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz"; - sha256 = "e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b"; + sha256 = "1d3j6f252mk316hrspwy63inrhxk6l78l4bmlmql401lqapb5yby"; }; nativeBuildInputs = [ - pkgconfig intltool libtool + pkgconfig intltool libtool file makeWrapper libxml2 libxslt docbook_xsl ]; buildInputs = - [ makeWrapper glib dbus udev libgudev udisks2 libgcrypt - libgphoto2 avahi libarchive fuse libcdio + [ glib dbus udev libgudev udisks2 libgcrypt + libgphoto2 avahi libarchive fuse libcdio lzma bzip2 samba libmtp libcap polkit # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ - gtk libsoup libgnome_keyring gconf gcr + libsoup libgnome_keyring gconf gcr # ToDo: not working and probably useless until gnome3 from x-updates ]);