Author: urkud
Date: Sat Oct 8 12:06:03 2011
New Revision: 29718
URL: https://nixos.org/websvn/nix/?rev=29718&sc=1
Log:
Drop 'gnomevfs = gnome_vfs;' alias
s/gnomevfs/gnome_vfs/ in packages
Modified:
nixpkgs/trunk/pkgs/applications/editors/gobby/default.nix
nixpkgs/trunk/pkgs/applications/editors/monodevelop/default.nix
nixpkgs/trunk/pkgs/applications/networking/browsers/icecat-3/default.nix
nixpkgs/trunk/pkgs/applications/networking/browsers/icecat-4/default.nix
nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix
nixpkgs/trunk/pkgs/development/guile-modules/guile-gnome/default.nix
nixpkgs/trunk/pkgs/development/libraries/libgsf/default.nix
nixpkgs/trunk/pkgs/tools/filesystems/relfs/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/editors/gobby/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/gobby/default.nix Sat Oct 8
11:59:24 2011 (r29717)
+++ nixpkgs/trunk/pkgs/applications/editors/gobby/default.nix Sat Oct 8
12:06:03 2011 (r29718)
@@ -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 @@
};
buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool
]
- ++ stdenv.lib.optional gnomeSupport gnomevfs;
+ ++ stdenv.lib.optional gnomeSupport gnome_vfs;
configureFlags = ''
'';
@@ -28,4 +28,4 @@
maintainers = [ maintainers.phreedom ];
platforms = platforms.all;
};
-}
\ No newline at end of file
+}
Modified: nixpkgs/trunk/pkgs/applications/editors/monodevelop/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/editors/monodevelop/default.nix Sat Oct
8 11:59:24 2011 (r29717)
+++ nixpkgs/trunk/pkgs/applications/editors/monodevelop/default.nix Sat Oct
8 12:06:03 2011 (r29718)
@@ -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 @@
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
];
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/icecat-3/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/icecat-3/default.nix
Sat Oct 8 11:59:24 2011 (r29717)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/icecat-3/default.nix
Sat Oct 8 12:06:03 2011 (r29718)
@@ -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 @@
};
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
Modified:
nixpkgs/trunk/pkgs/applications/networking/browsers/icecat-4/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/browsers/icecat-4/default.nix
Sat Oct 8 11:59:24 2011 (r29717)
+++ nixpkgs/trunk/pkgs/applications/networking/browsers/icecat-4/default.nix
Sat Oct 8 12:06:03 2011 (r29718)
@@ -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 @@
};
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
Modified: nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix Sat Oct 8 11:59:24
2011 (r29717)
+++ nixpkgs/trunk/pkgs/desktops/gnome-2.28/default.nix Sat Oct 8 12:06:03
2011 (r29718)
@@ -6,7 +6,6 @@
inherit (pkgs.gtkLibs) glib pango atk gtk gtkmm;
# Backward compatibility.
- gnomevfs = gnome_vfs;
startupnotification = startup_notification;
gnomedocutils = gnome_doc_utils;
gnomeicontheme = gnome_icon_theme;
Modified: nixpkgs/trunk/pkgs/development/guile-modules/guile-gnome/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/guile-modules/guile-gnome/default.nix
Sat Oct 8 11:59:24 2011 (r29717)
+++ nixpkgs/trunk/pkgs/development/guile-modules/guile-gnome/default.nix
Sat Oct 8 12:06:03 2011 (r29718)
@@ -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 @@
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;
Modified: nixpkgs/trunk/pkgs/development/libraries/libgsf/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libgsf/default.nix Sat Oct 8
11:59:24 2011 (r29717)
+++ nixpkgs/trunk/pkgs/development/libraries/libgsf/default.nix Sat Oct 8
12:06:03 2011 (r29718)
@@ -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 @@
};
buildInputs =
- [ perl perlXMLParser pkgconfig gettext bzip2 gnomevfs python intltool ];
+ [ perl perlXMLParser pkgconfig gettext bzip2 gnome_vfs python intltool ];
propagatedBuildInputs = [ glib libxml2 libbonobo ];
Modified: nixpkgs/trunk/pkgs/tools/filesystems/relfs/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/filesystems/relfs/default.nix Sat Oct 8
11:59:24 2011 (r29717)
+++ nixpkgs/trunk/pkgs/tools/filesystems/relfs/default.nix Sat Oct 8
12:06:03 2011 (r29718)
@@ -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
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Oct 8 11:59:24
2011 (r29717)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sat Oct 8 12:06:03
2011 (r29718)
@@ -1237,7 +1237,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
