JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop 'gnomevfs = gnome_vfs;' alias

Browse Source 
s/gnomevfs/gnome_vfs/ in packages

svn path=/nixpkgs/trunk/; revision=29718
This commit is contained in:
Yury G. Kudryashov 2011-10-08 12:06:03 +00:00
parent bc0b96370f
commit c35c6ec9fa
9 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/editors/gobby/default.nix
View File

@ -2,7 +2,7 @@
, gnomeSupport ? false # build support for Gnome(gnome-vfs) , gnomeSupport ? false # build support for Gnome(gnome-vfs)
, stdenv, fetchurl, pkgconfig , stdenv, fetchurl, pkgconfig
, gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool , gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool
, gnomevfs ? null}: , gnome_vfs ? null}:
let let
libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; };
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
}; };
buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ] buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ]
++ stdenv.lib.optional gnomeSupport gnomevfs; ++ stdenv.lib.optional gnomeSupport gnome_vfs;
configureFlags = '' configureFlags = ''
''; '';
@ -28,4 +28,4 @@ in stdenv.mkDerivation rec {
maintainers = [ maintainers.phreedom ]; maintainers = [ maintainers.phreedom ];
platforms = platforms.all; platforms = platforms.all;
}; };
} }

4
pkgs/applications/editors/monodevelop/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp { stdenv, fetchurl, file, mono, gtksharp, gtksourceviewsharp
, gtkmozembedsharp, monodoc , gtkmozembedsharp, monodoc
, perl, perlXMLParser, pkgconfig , perl, perlXMLParser, pkgconfig
, glib, gtk, GConf, gnomevfs, libbonobo, libglade, libgnome , glib, gtk, GConf, gnome_vfs, libbonobo, libglade, libgnome
, mozilla , mozilla
}: }:
@ -20,7 +20,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig file mono gtksharp gtksourceviewsharp perl perlXMLParser pkgconfig
glib gtk GConf gnomevfs libbonobo libglade libgnome glib gtk GConf gnome_vfs libbonobo libglade libgnome
gtkmozembedsharp monodoc gtkmozembedsharp monodoc
]; ];

4
pkgs/applications/networking/browsers/icecat-3/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL { fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
, libnotify, gnomevfs, libgnomeui , libnotify, gnome_vfs, libgnomeui
, freetype, fontconfig, wirelesstools ? null, pixman , freetype, fontconfig, wirelesstools ? null, pixman
, application ? "browser" }: , application ? "browser" }:
@ -19,7 +19,7 @@ stdenv.mkDerivation {
}; };
buildInputs = buildInputs =
[ xz libgnomeui libnotify gnomevfs alsaLib [ xz libgnomeui libnotify gnome_vfs alsaLib
pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
python ply dbus dbus_glib pango freetype fontconfig python ply dbus dbus_glib pango freetype fontconfig
xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt

4
pkgs/applications/networking/browsers/icecat-4/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL { fetchurl, stdenv, xz, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL
, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib , libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib
, libnotify, gnomevfs, libgnomeui , libnotify, gnome_vfs, libgnomeui
, freetype, fontconfig, wirelesstools ? null, pixman , freetype, fontconfig, wirelesstools ? null, pixman
, application ? "browser" }: , application ? "browser" }:
@ -19,7 +19,7 @@ stdenv.mkDerivation {
}; };
buildInputs = buildInputs =
[ xz libgnomeui libnotify gnomevfs alsaLib [ xz libgnomeui libnotify gnome_vfs alsaLib
pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman
python ply dbus dbus_glib pango freetype fontconfig python ply dbus dbus_glib pango freetype fontconfig
xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt

1
pkgs/desktops/gnome-2.28/default.nix
View File

@ -6,7 +6,6 @@ pkgs.makeOverridable
inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm; inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm;
# Backward compatibility. # Backward compatibility.
gnomevfs = gnome_vfs;
startupnotification = startup_notification; startupnotification = startup_notification;
gnomedocutils = gnome_doc_utils; gnomedocutils = gnome_doc_utils;
gnomeicontheme = gnome_icon_theme; gnomeicontheme = gnome_icon_theme;

4
pkgs/development/guile-modules/guile-gnome/default.nix
View File

@ -1,5 +1,5 @@
{ fetchurl, stdenv, guile, guile_lib, gwrap { fetchurl, stdenv, guile, guile_lib, gwrap
, pkgconfig, gconf, glib, gnomevfs, gtk , pkgconfig, gconf, glib, gnome_vfs, gtk
, libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }: , libglade, libgnome, libgnomecanvas, libgnomeui, pango, guileCairo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ guile gwrap [ guile gwrap
pkgconfig gconf glib gnomevfs gtk libglade libgnome libgnomecanvas pkgconfig gconf glib gnome_vfs gtk libglade libgnome libgnomecanvas
libgnomeui pango guileCairo libgnomeui pango guileCairo
] ]
++ stdenv.lib.optional doCheck guile_lib; ++ stdenv.lib.optional doCheck guile_lib;

4
pkgs/development/libraries/libgsf/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2 { fetchurl, stdenv, perl, perlXMLParser, pkgconfig, libxml2
, glib, gettext, intltool, bzip2 , glib, gettext, intltool, bzip2
, gnomevfs, libbonobo, python }: , gnome_vfs, libbonobo, python }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = buildInputs =
[ perl perlXMLParser pkgconfig gettext bzip2 gnomevfs python intltool ]; [ perl perlXMLParser pkgconfig gettext bzip2 gnome_vfs python intltool ];
propagatedBuildInputs = [ glib libxml2 libbonobo ]; propagatedBuildInputs = [ glib libxml2 libbonobo ];

4
pkgs/tools/filesystems/relfs/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchcvs, builderDefs, ocaml, fuse, postgresql, pcre { stdenv, fetchcvs, builderDefs, ocaml, fuse, postgresql, pcre
, libuuid, gnomevfs, pkgconfig, GConf }: , libuuid, gnome_vfs, pkgconfig, GConf }:
let localDefs = builderDefs.passthru.function { let localDefs = builderDefs.passthru.function {
src = fetchcvs { src = fetchcvs {
@ -10,7 +10,7 @@
}; };
buildInputs = [ocaml fuse postgresql pcre buildInputs = [ocaml fuse postgresql pcre
libuuid gnomevfs pkgconfig GConf]; libuuid gnome_vfs pkgconfig GConf];
configureFlags = []; configureFlags = [];
build = builderDefs.stringsWithDeps.fullDepEntry (" build = builderDefs.stringsWithDeps.fullDepEntry ("
cd deps cd deps

16
pkgs/top-level/all-packages.nix
View File

@ -1237,7 +1237,7 @@ let
reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { }; reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { };
relfs = callPackage ../tools/filesystems/relfs { relfs = callPackage ../tools/filesystems/relfs {
inherit (gnome) gnomevfs GConf; inherit (gnome) gnome_vfs GConf;
}; };
remind = callPackage ../tools/misc/remind { }; remind = callPackage ../tools/misc/remind { };
@ -2667,7 +2667,7 @@ let
guileGnome = callPackage ../development/guile-modules/guile-gnome { guileGnome = callPackage ../development/guile-modules/guile-gnome {
gconf = gnome.GConf; gconf = gnome.GConf;
inherit (gnome) glib gnomevfs gtk libglade libgnome libgnomecanvas inherit (gnome) glib gnome_vfs gtk libglade libgnome libgnomecanvas
libgnomeui pango; libgnomeui pango;
}; };
@ -3879,7 +3879,7 @@ let
libspectre = callPackage ../development/libraries/libspectre { }; libspectre = callPackage ../development/libraries/libspectre { };
libgsf = callPackage ../development/libraries/libgsf { libgsf = callPackage ../development/libraries/libgsf {
inherit (gnome) glib gnomevfs libbonobo; inherit (gnome) glib gnome_vfs libbonobo;
}; };
libiconv = callPackage ../development/libraries/libiconv { }; libiconv = callPackage ../development/libraries/libiconv { };
@ -6765,7 +6765,7 @@ let
inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
wirelesstools; wirelesstools;
inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango;
inherit (xlibs) pixman; inherit (xlibs) pixman;
inherit (pythonPackages) ply; inherit (pythonPackages) ply;
}); });
@ -6775,7 +6775,7 @@ let
inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
wirelesstools; wirelesstools;
inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango;
inherit (xlibs) pixman; inherit (xlibs) pixman;
inherit (pythonPackages) ply; inherit (pythonPackages) ply;
}); });
@ -6791,7 +6791,7 @@ let
inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
wirelesstools; wirelesstools;
inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango;
inherit (xlibs) pixman; inherit (xlibs) pixman;
inherit (pythonPackages) ply; inherit (pythonPackages) ply;
}); });
@ -6801,7 +6801,7 @@ let
inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo inherit fetchurl stdenv xz pkgconfig perl zip libjpeg libpng zlib cairo
python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify python dbus dbus_glib freetype fontconfig bzip2 xlibs alsaLib libnotify
wirelesstools; wirelesstools;
inherit (gnome) libIDL libgnomeui gnomevfs gtk pango; inherit (gnome) libIDL libgnomeui gnome_vfs gtk pango;
inherit (xlibs) pixman; inherit (xlibs) pixman;
inherit (pythonPackages) ply; inherit (pythonPackages) ply;
}); });
@ -6964,7 +6964,7 @@ let
mmex = callPackage ../applications/office/mmex { }; mmex = callPackage ../applications/office/mmex { };
monodevelop = callPackage ../applications/editors/monodevelop { 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; mozilla = firefox;
gtksharp = gtksharp2; gtksharp = gtksharp2;
}; };