From c35c6ec9fa326f092c6640c9f06b19ed15115765 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Sat, 8 Oct 2011 12:06:03 +0000 Subject: [PATCH] Drop 'gnomevfs = gnome_vfs;' alias s/gnomevfs/gnome_vfs/ in packages svn path=/nixpkgs/trunk/; revision=29718 --- pkgs/applications/editors/gobby/default.nix | 6 +++--- .../applications/editors/monodevelop/default.nix | 4 ++-- .../networking/browsers/icecat-3/default.nix | 4 ++-- .../networking/browsers/icecat-4/default.nix | 4 ++-- pkgs/desktops/gnome-2.28/default.nix | 1 - .../guile-modules/guile-gnome/default.nix | 4 ++-- pkgs/development/libraries/libgsf/default.nix | 4 ++-- pkgs/tools/filesystems/relfs/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 16 ++++++++-------- 9 files changed, 23 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index ea86f9caf528..badd18b8915b 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -2,7 +2,7 @@ , gnomeSupport ? false # build support for Gnome(gnome-vfs) , stdenv, fetchurl, pkgconfig , gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool -, gnomevfs ? null}: +, gnome_vfs ? null}: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ] - ++ stdenv.lib.optional gnomeSupport gnomevfs; + ++ stdenv.lib.optional gnomeSupport gnome_vfs; configureFlags = '' ''; @@ -28,4 +28,4 @@ in stdenv.mkDerivation rec { maintainers = [ maintainers.phreedom ]; platforms = platforms.all; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index 23dab206e188..e4dc00ff0a13 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp , gtkmozembedsharp, monodoc , perl, perlXMLParser, pkgconfig -, glib, gtk, GConf, gnomevfs, libbonobo, libglade, libgnome +, glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome , mozilla }: @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig - glib gtk GConf gnomevfs libbonobo libglade libgnome + glib gtk GConf gnome_vfs libbonobo libglade libgnome gtkmozembedsharp monodoc ]; diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index a63584fda289..99f135c6d7b4 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib -, libnotify, gnomevfs, libgnomeui +, libnotify, gnome_vfs, libgnomeui , freetype, fontconfig, wirelesstools ? null, pixman , application ? "browser" }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; buildInputs = - [ xz libgnomeui libnotify gnomevfs alsaLib + [ xz libgnomeui libnotify gnome_vfs alsaLib pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman python ply dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt diff --git a/pkgs/applications/networking/browsers/icecat-4/default.nix b/pkgs/applications/networking/browsers/icecat-4/default.nix index 5d6f5c3acb0d..9de1b4525a94 100644 --- a/pkgs/applications/networking/browsers/icecat-4/default.nix +++ b/pkgs/applications/networking/browsers/icecat-4/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib -, libnotify, gnomevfs, libgnomeui +, libnotify, gnome_vfs, libgnomeui , freetype, fontconfig, wirelesstools ? null, pixman , application ? "browser" }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; buildInputs = - [ xz libgnomeui libnotify gnomevfs alsaLib + [ xz libgnomeui libnotify gnome_vfs alsaLib pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman python ply dbus dbus_glib pango freetype fontconfig xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index e486cac465ea..7e56c158fdb1 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -6,7 +6,6 @@ pkgs.makeOverridable inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm; # Backward compatibility. - gnomevfs = gnome_vfs; startupnotification = startup_notification; gnomedocutils = gnome_doc_utils; gnomeicontheme = gnome_icon_theme; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index b6a7a43297c7..30480844a414 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, guile, guile_lib, gwrap -, pkgconfig, gconf, glib, gnomevfs, gtk +, pkgconfig, gconf, glib, gnome_vfs, gtk , libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ guile gwrap - pkgconfig gconf glib gnomevfs gtk libglade libgnome libgnomecanvas + pkgconfig gconf glib gnome_vfs gtk libglade libgnome libgnomecanvas libgnomeui pango guileCairo ] ++ stdenv.lib.optional doCheck guile_lib; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index d68cb73b2b5e..a417f63cdd9f 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 , glib, gettext, intltool, bzip2 -, gnomevfs, libbonobo, python }: +, gnome_vfs, libbonobo, python }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ perl perlXMLParser pkgconfig gettext bzip2 gnomevfs python intltool ]; + [ perl perlXMLParser pkgconfig gettext bzip2 gnome_vfs python intltool ]; propagatedBuildInputs = [ glib libxml2 libbonobo ]; diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix index 2eb8e3a0b3ba..56dad0c1e3dd 100644 --- a/pkgs/tools/filesystems/relfs/default.nix +++ b/pkgs/tools/filesystems/relfs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchcvs, builderDefs, ocaml, fuse, postgresql, pcre -, libuuid, gnomevfs, pkgconfig, GConf }: +, libuuid, gnome_vfs, pkgconfig, GConf }: let localDefs = builderDefs.passthru.function { src = fetchcvs { @@ -10,7 +10,7 @@ }; buildInputs = [ocaml fuse postgresql pcre - libuuid gnomevfs pkgconfig GConf]; + libuuid gnome_vfs pkgconfig GConf]; configureFlags = []; build = builderDefs.stringsWithDeps.fullDepEntry (" cd deps diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ed9c99fbde3..84a00ecaa993 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1237,7 +1237,7 @@ let reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { }; relfs = callPackage ../tools/filesystems/relfs { - inherit (gnome) gnomevfs GConf; + inherit (gnome) gnome_vfs GConf; }; remind = callPackage ../tools/misc/remind { }; @@ -2667,7 +2667,7 @@ let guileGnome = callPackage ../development/guile-modules/guile-gnome { gconf = gnome.GConf; - inherit (gnome) glib gnomevfs gtk libglade libgnome libgnomecanvas + inherit (gnome) glib gnome_vfs gtk libglade libgnome libgnomecanvas libgnomeui pango; }; @@ -3879,7 +3879,7 @@ let libspectre = callPackage ../development/libraries/libspectre { }; libgsf = callPackage ../development/libraries/libgsf { - inherit (gnome) glib gnomevfs libbonobo; + inherit (gnome) glib gnome_vfs libbonobo; }; libiconv = callPackage ../development/libraries/libiconv { }; @@ -6765,7 +6765,7 @@ let inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify wirelesstools; - inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; + inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (xlibs) pixman; inherit (pythonPackages) ply; }); @@ -6775,7 +6775,7 @@ let inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify wirelesstools; - inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; + inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (xlibs) pixman; inherit (pythonPackages) ply; }); @@ -6791,7 +6791,7 @@ let inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify wirelesstools; - inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; + inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (xlibs) pixman; inherit (pythonPackages) ply; }); @@ -6801,7 +6801,7 @@ let inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify wirelesstools; - inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; + inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango; inherit (xlibs) pixman; inherit (pythonPackages) ply; }); @@ -6964,7 +6964,7 @@ let mmex = callPackage ../applications/office/mmex { }; monodevelop = callPackage ../applications/editors/monodevelop { - inherit (gnome) gnomevfs libbonobo libglade libgnome GConf glib gtk; + inherit (gnome) gnome_vfs libbonobo libglade libgnome GConf glib gtk; mozilla = firefox; gtksharp = gtksharp2; };