diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-28 16:38:39 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-02-28 16:38:39 +0000 |
commit | 3d98c0bf146eceb3ab3f59bf5004bfc888d7ba54 (patch) | |
tree | df65244f12faa45c5991ab2e960d27ac7bd3453a | |
parent | e7a1a1cba190ef8c9edb16f7199ef946ff54fb77 (diff) | |
download | nixpkgs-3d98c0bf146eceb3ab3f59bf5004bfc888d7ba54.tar nixpkgs-3d98c0bf146eceb3ab3f59bf5004bfc888d7ba54.tar.gz nixpkgs-3d98c0bf146eceb3ab3f59bf5004bfc888d7ba54.tar.bz2 nixpkgs-3d98c0bf146eceb3ab3f59bf5004bfc888d7ba54.tar.lz nixpkgs-3d98c0bf146eceb3ab3f59bf5004bfc888d7ba54.tar.xz nixpkgs-3d98c0bf146eceb3ab3f59bf5004bfc888d7ba54.tar.zst nixpkgs-3d98c0bf146eceb3ab3f59bf5004bfc888d7ba54.zip |
* Get rid of all those pointless little directories.
svn path=/nixpkgs/trunk/; revision=8107
-rw-r--r-- | pkgs/desktops/gnome/GConf.nix (renamed from pkgs/desktops/gnome/GConf/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/ORBit2.nix (renamed from pkgs/desktops/gnome/ORBit2/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/default.nix | 54 | ||||
-rw-r--r-- | pkgs/desktops/gnome/esound.nix (renamed from pkgs/desktops/gnome/esound/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/gail.nix (renamed from pkgs/desktops/gnome/gail/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/gnome-desktop.nix (renamed from pkgs/desktops/gnome/gnome-desktop/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/gnome-icon-theme-2.14.2.patch (renamed from pkgs/desktops/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/gnome-icon-theme.nix (renamed from pkgs/desktops/gnome/gnome-icon-theme/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/gnome-keyring.nix (renamed from pkgs/desktops/gnome/gnome-keyring/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/gnome-mime-data.nix (renamed from pkgs/desktops/gnome/gnome-mime-data/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/gnome-panel.nix (renamed from pkgs/desktops/gnome/gnome-panel/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/gnome-vfs.nix (renamed from pkgs/desktops/gnome/gnome-vfs/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/gtkhtml.nix (renamed from pkgs/desktops/gnome/gtkhtml/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/gtksourceview.nix (renamed from pkgs/desktops/gnome/gtksourceview/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/intltool.nix (renamed from pkgs/desktops/gnome/intltool/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libIDL.nix (renamed from pkgs/desktops/gnome/libIDL/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libart_lgpl.nix (renamed from pkgs/desktops/gnome/libart_lgpl/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libbonobo.nix (renamed from pkgs/desktops/gnome/libbonobo/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libbonoboui.nix (renamed from pkgs/desktops/gnome/libbonoboui/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libglade.nix (renamed from pkgs/desktops/gnome/libglade/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libgnome.nix (renamed from pkgs/desktops/gnome/libgnome/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libgnomecanvas.nix (renamed from pkgs/desktops/gnome/libgnomecanvas/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libgnomeprint.nix (renamed from pkgs/desktops/gnome/libgnomeprint/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libgnomeprintui.nix (renamed from pkgs/desktops/gnome/libgnomeprintui/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libgnomeui.nix (renamed from pkgs/desktops/gnome/libgnomeui/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libgtkhtml.nix (renamed from pkgs/desktops/gnome/libgtkhtml/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libsoup.nix (renamed from pkgs/desktops/gnome/libsoup/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/libwnck.nix (renamed from pkgs/desktops/gnome/libwnck/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/no-kerberos.patch (renamed from pkgs/desktops/gnome/gnome-vfs/no-kerberos.patch) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/scrollkeeper.nix (renamed from pkgs/desktops/gnome/scrollkeeper/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/startup-notification.nix (renamed from pkgs/desktops/gnome/startup-notification/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome/xmlcatalog.patch (renamed from pkgs/desktops/gnome/scrollkeeper/xmlcatalog.patch) | 0 |
32 files changed, 27 insertions, 27 deletions
diff --git a/pkgs/desktops/gnome/GConf/default.nix b/pkgs/desktops/gnome/GConf.nix index 74b646f6cc3..74b646f6cc3 100644 --- a/pkgs/desktops/gnome/GConf/default.nix +++ b/pkgs/desktops/gnome/GConf.nix diff --git a/pkgs/desktops/gnome/ORBit2/default.nix b/pkgs/desktops/gnome/ORBit2.nix index 69f62fb79a6..69f62fb79a6 100644 --- a/pkgs/desktops/gnome/ORBit2/default.nix +++ b/pkgs/desktops/gnome/ORBit2.nix diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 6484f7adcfa..f433658cf68 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -22,86 +22,86 @@ rec { gtk = gtkLibs.gtk; - esound = (import ./esound) { + esound = (import ./esound.nix) { inherit fetchurl stdenv audiofile; input = platform.esound; }; - libIDL = (import ./libIDL) { + libIDL = (import ./libIDL.nix) { inherit fetchurl stdenv pkgconfig glib; input = platform.libIDL; lex = flex; yacc = bison; }; - ORBit2 = (import ./ORBit2) { + ORBit2 = (import ./ORBit2.nix) { inherit fetchurl stdenv pkgconfig glib libIDL popt; input = platform.ORBit2; }; - GConf = (import ./GConf) { + GConf = (import ./GConf.nix) { inherit fetchurl stdenv pkgconfig perl glib gtk libxml2 ORBit2 popt; input = platform.GConf; }; - gnomemimedata = (import ./gnome-mime-data) { + gnomemimedata = (import ./gnome-mime-data.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser; input = platform.gnomemimedata; }; - gnomevfs = (import ./gnome-vfs) { + gnomevfs = (import ./gnome-vfs.nix) { inherit fetchurl stdenv pkgconfig perl glib libxml2 GConf libbonobo gnomemimedata popt perlXMLParser gettext bzip2; input = platform.gnomevfs; }; - gail = (import ./gail) { + gail = (import ./gail.nix) { inherit fetchurl stdenv pkgconfig; inherit gtk atk libgnomecanvas; input = platform.gail; }; - libgnome = (import ./libgnome) { + libgnome = (import ./libgnome.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gnomevfs libbonobo GConf popt zlib esound; input = platform.libgnome; }; - libart_lgpl = (import ./libart_lgpl) { + libart_lgpl = (import ./libart_lgpl.nix) { inherit fetchurl stdenv; input = platform.libart_lgpl; }; - libglade = (import ./libglade) { + libglade = (import ./libglade.nix) { inherit fetchurl stdenv pkgconfig gtk libxml2; input = platform.libglade; }; - libgnomecanvas = (import ./libgnomecanvas) { + libgnomecanvas = (import ./libgnomecanvas.nix) { inherit fetchurl stdenv pkgconfig gtk libglade; libart = libart_lgpl; input = platform.libgnomecanvas; }; - libbonobo = (import ./libbonobo) { + libbonobo = (import ./libbonobo.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser ORBit2 libxml2 popt flex; yacc = bison; input = platform.libbonobo; }; - libbonoboui = (import ./libbonoboui) { + libbonoboui = (import ./libbonoboui.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 libglade libgnome libgnomecanvas gettext; input = platform.libbonoboui; }; - libgnomeui = (import ./libgnomeui) { + libgnomeui = (import ./libgnomeui.nix) { inherit fetchurl stdenv pkgconfig libgnome libgnomecanvas libbonoboui libglade libjpeg esound gnomekeyring; input = platform.libgnomeui; }; - intltool = (import ./intltool) { + intltool = (import ./intltool.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser; input = platform.intltool; }; @@ -113,7 +113,7 @@ rec { inherit fetchurl; }; - libgnomeprint = (import ./libgnomeprint) { + libgnomeprint = (import ./libgnomeprint.nix) { inherit fetchurl stdenv libxml2 perl perlXMLParser pkgconfig popt bison flex; inherit glib pango; @@ -121,13 +121,13 @@ rec { input = desktop.libgnomeprint; }; - libgnomeprintui = (import ./libgnomeprintui) { + libgnomeprintui = (import ./libgnomeprintui.nix) { inherit fetchurl stdenv perl perlXMLParser pkgconfig; inherit gtk libgnomeprint libgnomecanvas gnomeicontheme; input = desktop.libgnomeprintui; }; - gtkhtml = (import ./gtkhtml) { + gtkhtml = (import ./gtkhtml.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libjpeg gettext; inherit gtk atk gail libgnomeprint libgnomeprintui libgnomeui libglade gnomeicontheme; input = desktop.gtkhtml; @@ -135,53 +135,53 @@ rec { libgtkhtml = gtkhtml; - gnomeicontheme = (import ./gnome-icon-theme) { + gnomeicontheme = (import ./gnome-icon-theme.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser; input = desktop.gnomeicontheme; }; - gnomekeyring = (import ./gnome-keyring) { + gnomekeyring = (import ./gnome-keyring.nix) { inherit fetchurl stdenv pkgconfig glib gtk; input = desktop.gnomekeyring; }; - gtksourceview = (import ./gtksourceview) { + gtksourceview = (import ./gtksourceview.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser gtk libxml2 libgnomeprint gnomevfs libbonobo /* !!! <- should be propagated in gnomevfs */ GConf /* idem */ libgnomeprintui libgnomecanvas /* !!! through printui */; input = desktop.gtksourceview; }; - scrollkeeper = (import ./scrollkeeper) { + scrollkeeper = (import ./scrollkeeper.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42; input = desktop.scrollkeeper; }; - gnomedesktop = (import ./gnome-desktop) { + gnomedesktop = (import ./gnome-desktop.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk libgnomeui scrollkeeper libjpeg; input = desktop.gnomedesktop; }; - libwnck = (import ./libwnck) { + libwnck = (import ./libwnck.nix) { inherit fetchurl stdenv pkgconfig gtk perl perlXMLParser gettext; input = desktop.libwnck; }; - gnomepanel = (import ./gnome-panel) { + gnomepanel = (import ./gnome-panel.nix) { inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gtk ORBit2 libgnome libgnomeui gnomedesktop libglade libwnck libjpeg libpng scrollkeeper libXmu; input = desktop.gnomepanel; }; - libsoup = (import ./libsoup) { + libsoup = (import ./libsoup.nix) { inherit stdenv fetchurl pkgconfig libxml2 glib; input = desktop.libsoup; }; - startupnotification = (import ./startup-notification) { + startupnotification = (import ./startup-notification.nix) { inherit stdenv fetchurl pkgconfig x11; input = desktop.startupnotification; }; diff --git a/pkgs/desktops/gnome/esound/default.nix b/pkgs/desktops/gnome/esound.nix index eb3727bc1c2..eb3727bc1c2 100644 --- a/pkgs/desktops/gnome/esound/default.nix +++ b/pkgs/desktops/gnome/esound.nix diff --git a/pkgs/desktops/gnome/gail/default.nix b/pkgs/desktops/gnome/gail.nix index 2957aa90de5..2957aa90de5 100644 --- a/pkgs/desktops/gnome/gail/default.nix +++ b/pkgs/desktops/gnome/gail.nix diff --git a/pkgs/desktops/gnome/gnome-desktop/default.nix b/pkgs/desktops/gnome/gnome-desktop.nix index ecd575cfd3d..ecd575cfd3d 100644 --- a/pkgs/desktops/gnome/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome/gnome-desktop.nix diff --git a/pkgs/desktops/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch b/pkgs/desktops/gnome/gnome-icon-theme-2.14.2.patch index 81b12cd1449..81b12cd1449 100644 --- a/pkgs/desktops/gnome/gnome-icon-theme/gnome-icon-theme-2.14.2.patch +++ b/pkgs/desktops/gnome/gnome-icon-theme-2.14.2.patch diff --git a/pkgs/desktops/gnome/gnome-icon-theme/default.nix b/pkgs/desktops/gnome/gnome-icon-theme.nix index e5c7d408c65..e5c7d408c65 100644 --- a/pkgs/desktops/gnome/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome/gnome-icon-theme.nix diff --git a/pkgs/desktops/gnome/gnome-keyring/default.nix b/pkgs/desktops/gnome/gnome-keyring.nix index d781cbbb523..d781cbbb523 100644 --- a/pkgs/desktops/gnome/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/gnome-keyring.nix diff --git a/pkgs/desktops/gnome/gnome-mime-data/default.nix b/pkgs/desktops/gnome/gnome-mime-data.nix index 90012a62075..90012a62075 100644 --- a/pkgs/desktops/gnome/gnome-mime-data/default.nix +++ b/pkgs/desktops/gnome/gnome-mime-data.nix diff --git a/pkgs/desktops/gnome/gnome-panel/default.nix b/pkgs/desktops/gnome/gnome-panel.nix index 49ef9203f31..49ef9203f31 100644 --- a/pkgs/desktops/gnome/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/gnome-panel.nix diff --git a/pkgs/desktops/gnome/gnome-vfs/default.nix b/pkgs/desktops/gnome/gnome-vfs.nix index 75f9ed77a85..75f9ed77a85 100644 --- a/pkgs/desktops/gnome/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome/gnome-vfs.nix diff --git a/pkgs/desktops/gnome/gtkhtml/default.nix b/pkgs/desktops/gnome/gtkhtml.nix index b5b6caad469..b5b6caad469 100644 --- a/pkgs/desktops/gnome/gtkhtml/default.nix +++ b/pkgs/desktops/gnome/gtkhtml.nix diff --git a/pkgs/desktops/gnome/gtksourceview/default.nix b/pkgs/desktops/gnome/gtksourceview.nix index 8ad7955e8d4..8ad7955e8d4 100644 --- a/pkgs/desktops/gnome/gtksourceview/default.nix +++ b/pkgs/desktops/gnome/gtksourceview.nix diff --git a/pkgs/desktops/gnome/intltool/default.nix b/pkgs/desktops/gnome/intltool.nix index 8807f7ab897..8807f7ab897 100644 --- a/pkgs/desktops/gnome/intltool/default.nix +++ b/pkgs/desktops/gnome/intltool.nix diff --git a/pkgs/desktops/gnome/libIDL/default.nix b/pkgs/desktops/gnome/libIDL.nix index 2a2dd49e2d1..2a2dd49e2d1 100644 --- a/pkgs/desktops/gnome/libIDL/default.nix +++ b/pkgs/desktops/gnome/libIDL.nix diff --git a/pkgs/desktops/gnome/libart_lgpl/default.nix b/pkgs/desktops/gnome/libart_lgpl.nix index 4f05f788b4d..4f05f788b4d 100644 --- a/pkgs/desktops/gnome/libart_lgpl/default.nix +++ b/pkgs/desktops/gnome/libart_lgpl.nix diff --git a/pkgs/desktops/gnome/libbonobo/default.nix b/pkgs/desktops/gnome/libbonobo.nix index 03b4cd55625..03b4cd55625 100644 --- a/pkgs/desktops/gnome/libbonobo/default.nix +++ b/pkgs/desktops/gnome/libbonobo.nix diff --git a/pkgs/desktops/gnome/libbonoboui/default.nix b/pkgs/desktops/gnome/libbonoboui.nix index ba0b3aee0ad..ba0b3aee0ad 100644 --- a/pkgs/desktops/gnome/libbonoboui/default.nix +++ b/pkgs/desktops/gnome/libbonoboui.nix diff --git a/pkgs/desktops/gnome/libglade/default.nix b/pkgs/desktops/gnome/libglade.nix index 2719379359c..2719379359c 100644 --- a/pkgs/desktops/gnome/libglade/default.nix +++ b/pkgs/desktops/gnome/libglade.nix diff --git a/pkgs/desktops/gnome/libgnome/default.nix b/pkgs/desktops/gnome/libgnome.nix index dda72143bd3..dda72143bd3 100644 --- a/pkgs/desktops/gnome/libgnome/default.nix +++ b/pkgs/desktops/gnome/libgnome.nix diff --git a/pkgs/desktops/gnome/libgnomecanvas/default.nix b/pkgs/desktops/gnome/libgnomecanvas.nix index 6602cf43ebc..6602cf43ebc 100644 --- a/pkgs/desktops/gnome/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome/libgnomecanvas.nix diff --git a/pkgs/desktops/gnome/libgnomeprint/default.nix b/pkgs/desktops/gnome/libgnomeprint.nix index 6a44c549f4c..6a44c549f4c 100644 --- a/pkgs/desktops/gnome/libgnomeprint/default.nix +++ b/pkgs/desktops/gnome/libgnomeprint.nix diff --git a/pkgs/desktops/gnome/libgnomeprintui/default.nix b/pkgs/desktops/gnome/libgnomeprintui.nix index 34f2b799498..34f2b799498 100644 --- a/pkgs/desktops/gnome/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome/libgnomeprintui.nix diff --git a/pkgs/desktops/gnome/libgnomeui/default.nix b/pkgs/desktops/gnome/libgnomeui.nix index af1d81e6984..af1d81e6984 100644 --- a/pkgs/desktops/gnome/libgnomeui/default.nix +++ b/pkgs/desktops/gnome/libgnomeui.nix diff --git a/pkgs/desktops/gnome/libgtkhtml/default.nix b/pkgs/desktops/gnome/libgtkhtml.nix index 839ce401471..839ce401471 100644 --- a/pkgs/desktops/gnome/libgtkhtml/default.nix +++ b/pkgs/desktops/gnome/libgtkhtml.nix diff --git a/pkgs/desktops/gnome/libsoup/default.nix b/pkgs/desktops/gnome/libsoup.nix index 0e93c70ae9a..0e93c70ae9a 100644 --- a/pkgs/desktops/gnome/libsoup/default.nix +++ b/pkgs/desktops/gnome/libsoup.nix diff --git a/pkgs/desktops/gnome/libwnck/default.nix b/pkgs/desktops/gnome/libwnck.nix index 03912ef8044..03912ef8044 100644 --- a/pkgs/desktops/gnome/libwnck/default.nix +++ b/pkgs/desktops/gnome/libwnck.nix diff --git a/pkgs/desktops/gnome/gnome-vfs/no-kerberos.patch b/pkgs/desktops/gnome/no-kerberos.patch index e34b74bb8a1..e34b74bb8a1 100644 --- a/pkgs/desktops/gnome/gnome-vfs/no-kerberos.patch +++ b/pkgs/desktops/gnome/no-kerberos.patch diff --git a/pkgs/desktops/gnome/scrollkeeper/default.nix b/pkgs/desktops/gnome/scrollkeeper.nix index ffdbe065912..ffdbe065912 100644 --- a/pkgs/desktops/gnome/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome/scrollkeeper.nix diff --git a/pkgs/desktops/gnome/startup-notification/default.nix b/pkgs/desktops/gnome/startup-notification.nix index b8df1c22edc..b8df1c22edc 100644 --- a/pkgs/desktops/gnome/startup-notification/default.nix +++ b/pkgs/desktops/gnome/startup-notification.nix diff --git a/pkgs/desktops/gnome/scrollkeeper/xmlcatalog.patch b/pkgs/desktops/gnome/xmlcatalog.patch index 77313819fce..77313819fce 100644 --- a/pkgs/desktops/gnome/scrollkeeper/xmlcatalog.patch +++ b/pkgs/desktops/gnome/xmlcatalog.patch |