* Rename .fix -> .nix.

svn path=/nixpkgs/trunk/; revision=511

69 files changed, 7 insertions, 7 deletions

diff --git a/pkgs/applications/graphics/gqview/default.fix b/pkgs/applications/graphics/gqview/default.nix
index e9edb7f0bd001..e9edb7f0bd001 100644
--- a/pkgs/applications/graphics/gqview/default.fix
+++ b/pkgs/applications/graphics/gqview/default.nix
diff --git a/pkgs/applications/networking/browsers/firebird/default.fix b/pkgs/applications/networking/browsers/firebird/default.nix
index b17b4a0e47315..b17b4a0e47315 100644
--- a/pkgs/applications/networking/browsers/firebird/default.fix
+++ b/pkgs/applications/networking/browsers/firebird/default.nix
diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.fix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
index c6e8cc066f8c1..c6e8cc066f8c1 100644
--- a/pkgs/applications/networking/mailreaders/sylpheed/default.fix
+++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix
diff --git a/pkgs/applications/networking/newsreaders/pan/default.fix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 26b7e6af2b526..26b7e6af2b526 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.fix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
diff --git a/pkgs/applications/version-management/subversion/default.fix b/pkgs/applications/version-management/subversion/default.nix
index 76a46511b2710..76a46511b2710 100644
--- a/pkgs/applications/version-management/subversion/default.fix
+++ b/pkgs/applications/version-management/subversion/default.nix
diff --git a/pkgs/applications/video/MPlayer/default.fix b/pkgs/applications/video/MPlayer/default.nix
index 065676bc2ad57..065676bc2ad57 100644
--- a/pkgs/applications/video/MPlayer/default.fix
+++ b/pkgs/applications/video/MPlayer/default.nix
diff --git a/pkgs/applications/video/MPlayer/win32codecs/default.fix b/pkgs/applications/video/MPlayer/win32codecs/default.nix
index 699875ae15941..699875ae15941 100644
--- a/pkgs/applications/video/MPlayer/win32codecs/default.fix
+++ b/pkgs/applications/video/MPlayer/win32codecs/default.nix
diff --git a/pkgs/applications/video/mplayerplug-in/default.fix b/pkgs/applications/video/mplayerplug-in/default.nix
index c06fc31fee425..c06fc31fee425 100644
--- a/pkgs/applications/video/mplayerplug-in/default.fix
+++ b/pkgs/applications/video/mplayerplug-in/default.nix
diff --git a/pkgs/build-support/fetchurl/default.fix b/pkgs/build-support/fetchurl/default.nix
index fe2c79bbcdd15..fe2c79bbcdd15 100644
--- a/pkgs/build-support/fetchurl/default.fix
+++ b/pkgs/build-support/fetchurl/default.nix
diff --git a/pkgs/development/compilers/gcc/default.fix b/pkgs/development/compilers/gcc/default.nix
index 0effb18de1a7f..0effb18de1a7f 100644
--- a/pkgs/development/compilers/gcc/default.fix
+++ b/pkgs/development/compilers/gcc/default.nix
diff --git a/pkgs/development/interpreters/perl/default.fix b/pkgs/development/interpreters/perl/default.nix
index 8d9fa7f610d3f..8d9fa7f610d3f 100644
--- a/pkgs/development/interpreters/perl/default.fix
+++ b/pkgs/development/interpreters/perl/default.nix
diff --git a/pkgs/development/libraries/aterm/default.fix b/pkgs/development/libraries/aterm/default.nix
index 56b4c265ec0b2..56b4c265ec0b2 100644
--- a/pkgs/development/libraries/aterm/default.fix
+++ b/pkgs/development/libraries/aterm/default.nix
diff --git a/pkgs/development/libraries/db4/default.fix b/pkgs/development/libraries/db4/default.nix
index 06974133ce92e..06974133ce92e 100644
--- a/pkgs/development/libraries/db4/default.fix
+++ b/pkgs/development/libraries/db4/default.nix
diff --git a/pkgs/development/libraries/expat/default.fix b/pkgs/development/libraries/expat/default.nix
index 77b025b739fdb..77b025b739fdb 100644
--- a/pkgs/development/libraries/expat/default.fix
+++ b/pkgs/development/libraries/expat/default.nix
diff --git a/pkgs/development/libraries/fontconfig/default.fix b/pkgs/development/libraries/fontconfig/default.nix
index 15944697423e2..15944697423e2 100644
--- a/pkgs/development/libraries/fontconfig/default.fix
+++ b/pkgs/development/libraries/fontconfig/default.nix
diff --git a/pkgs/development/libraries/freetype/default.fix b/pkgs/development/libraries/freetype/default.nix
index 4284979844d23..4284979844d23 100644
--- a/pkgs/development/libraries/freetype/default.fix
+++ b/pkgs/development/libraries/freetype/default.nix
diff --git a/pkgs/development/libraries/gettext/default.fix b/pkgs/development/libraries/gettext/default.nix
index d20c6f4763e8d..d20c6f4763e8d 100644
--- a/pkgs/development/libraries/gettext/default.fix
+++ b/pkgs/development/libraries/gettext/default.nix
diff --git a/pkgs/development/libraries/glibc/default.fix b/pkgs/development/libraries/glibc/default.nix
index bf001b85b2a45..bf001b85b2a45 100644
--- a/pkgs/development/libraries/glibc/default.fix
+++ b/pkgs/development/libraries/glibc/default.nix
diff --git a/pkgs/development/libraries/gnet/default.fix b/pkgs/development/libraries/gnet/default.nix
index 0475dfa06ab1d..0475dfa06ab1d 100644
--- a/pkgs/development/libraries/gnet/default.fix
+++ b/pkgs/development/libraries/gnet/default.nix
diff --git a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.fix b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix
index 8fe9f5e0e1407..8fe9f5e0e1407 100644
--- a/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.fix
+++ b/pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.nix
diff --git a/pkgs/development/libraries/gtk+-1/glib/default.fix b/pkgs/development/libraries/gtk+-1/glib/default.nix
index 7ae9be406b3eb..7ae9be406b3eb 100644
--- a/pkgs/development/libraries/gtk+-1/glib/default.fix
+++ b/pkgs/development/libraries/gtk+-1/glib/default.nix
diff --git a/pkgs/development/libraries/gtk+-1/gtk+/default.fix b/pkgs/development/libraries/gtk+-1/gtk+/default.nix
index 856b2ffcad0e5..856b2ffcad0e5 100644
--- a/pkgs/development/libraries/gtk+-1/gtk+/default.fix
+++ b/pkgs/development/libraries/gtk+-1/gtk+/default.nix
diff --git a/pkgs/development/libraries/gtk+/atk/default.fix b/pkgs/development/libraries/gtk+/atk/default.nix
index 8db047f9c4928..8db047f9c4928 100644
--- a/pkgs/development/libraries/gtk+/atk/default.fix
+++ b/pkgs/development/libraries/gtk+/atk/default.nix
diff --git a/pkgs/development/libraries/gtk+/glib/default.fix b/pkgs/development/libraries/gtk+/glib/default.nix
index 227aa80f17d29..227aa80f17d29 100644
--- a/pkgs/development/libraries/gtk+/glib/default.fix
+++ b/pkgs/development/libraries/gtk+/glib/default.nix
diff --git a/pkgs/development/libraries/gtk+/gtk+/default.fix b/pkgs/development/libraries/gtk+/gtk+/default.nix
index f0fe5979d0b7b..f0fe5979d0b7b 100644
--- a/pkgs/development/libraries/gtk+/gtk+/default.fix
+++ b/pkgs/development/libraries/gtk+/gtk+/default.nix
diff --git a/pkgs/development/libraries/gtk+/pango/default.fix b/pkgs/development/libraries/gtk+/pango/default.nix
index d598d97f9c370..d598d97f9c370 100644
--- a/pkgs/development/libraries/gtk+/pango/default.fix
+++ b/pkgs/development/libraries/gtk+/pango/default.nix
diff --git a/pkgs/development/libraries/libIDL/default.fix b/pkgs/development/libraries/libIDL/default.nix
index 79ef17dd6b847..79ef17dd6b847 100644
--- a/pkgs/development/libraries/libIDL/default.fix
+++ b/pkgs/development/libraries/libIDL/default.nix
diff --git a/pkgs/development/libraries/libjpeg/default.fix b/pkgs/development/libraries/libjpeg/default.nix
index 80946833f721a..80946833f721a 100644
--- a/pkgs/development/libraries/libjpeg/default.fix
+++ b/pkgs/development/libraries/libjpeg/default.nix
diff --git a/pkgs/development/libraries/libpng/default.fix b/pkgs/development/libraries/libpng/default.nix
index 47322de7d1751..47322de7d1751 100644
--- a/pkgs/development/libraries/libpng/default.fix
+++ b/pkgs/development/libraries/libpng/default.nix
diff --git a/pkgs/development/libraries/libtiff/default.fix b/pkgs/development/libraries/libtiff/default.nix
index 7a14a63ce3375..7a14a63ce3375 100644
--- a/pkgs/development/libraries/libtiff/default.fix
+++ b/pkgs/development/libraries/libtiff/default.nix
diff --git a/pkgs/development/libraries/libxml2/default.fix b/pkgs/development/libraries/libxml2/default.nix
index 3e2fb8b13e564..3e2fb8b13e564 100644
--- a/pkgs/development/libraries/libxml2/default.fix
+++ b/pkgs/development/libraries/libxml2/default.nix
diff --git a/pkgs/development/libraries/openssl/default.fix b/pkgs/development/libraries/openssl/default.nix
index 38bf22cb0bfd3..38bf22cb0bfd3 100644
--- a/pkgs/development/libraries/openssl/default.fix
+++ b/pkgs/development/libraries/openssl/default.nix
diff --git a/pkgs/development/libraries/pcre/default.fix b/pkgs/development/libraries/pcre/default.nix
index 9e18d88fccf20..9e18d88fccf20 100644
--- a/pkgs/development/libraries/pcre/default.fix
+++ b/pkgs/development/libraries/pcre/default.nix
diff --git a/pkgs/development/libraries/xft/default.fix b/pkgs/development/libraries/xft/default.nix
index 0764a1dd80ad2..0764a1dd80ad2 100644
--- a/pkgs/development/libraries/xft/default.fix
+++ b/pkgs/development/libraries/xft/default.nix
diff --git a/pkgs/development/libraries/zlib/default.fix b/pkgs/development/libraries/zlib/default.nix
index 7dfe3e6a9ab81..7dfe3e6a9ab81 100644
--- a/pkgs/development/libraries/zlib/default.fix
+++ b/pkgs/development/libraries/zlib/default.nix
diff --git a/pkgs/development/tools/build-managers/gnumake/default.fix b/pkgs/development/tools/build-managers/gnumake/default.nix
index 6ca56d57ba6d7..6ca56d57ba6d7 100644
--- a/pkgs/development/tools/build-managers/gnumake/default.fix
+++ b/pkgs/development/tools/build-managers/gnumake/default.nix
diff --git a/pkgs/development/tools/misc/binutils/default.fix b/pkgs/development/tools/misc/binutils/default.nix
index 07d6b416a54a7..07d6b416a54a7 100644
--- a/pkgs/development/tools/misc/binutils/default.fix
+++ b/pkgs/development/tools/misc/binutils/default.nix
diff --git a/pkgs/development/tools/misc/gnum4/default.fix b/pkgs/development/tools/misc/gnum4/default.nix
index 25d095d387a06..25d095d387a06 100644
--- a/pkgs/development/tools/misc/gnum4/default.fix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
diff --git a/pkgs/development/tools/misc/pkgconfig/default.fix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 9194b04184374..9194b04184374 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.fix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
diff --git a/pkgs/development/tools/parsing/bison/default.fix b/pkgs/development/tools/parsing/bison/default.nix
index fc8941b76f346..fc8941b76f346 100644
--- a/pkgs/development/tools/parsing/bison/default.fix
+++ b/pkgs/development/tools/parsing/bison/default.nix
diff --git a/pkgs/development/tools/parsing/flex/default.fix b/pkgs/development/tools/parsing/flex/default.nix
index 605c29db2d223..605c29db2d223 100644
--- a/pkgs/development/tools/parsing/flex/default.fix
+++ b/pkgs/development/tools/parsing/flex/default.nix
diff --git a/pkgs/os-specific/linux/alsa/library/default.fix b/pkgs/os-specific/linux/alsa/library/default.nix
index f13ca6ec54eff..f13ca6ec54eff 100644
--- a/pkgs/os-specific/linux/alsa/library/default.fix
+++ b/pkgs/os-specific/linux/alsa/library/default.nix
diff --git a/pkgs/os-specific/linux/kernel-headers/default.fix b/pkgs/os-specific/linux/kernel-headers/default.nix
index cc626a25b2695..cc626a25b2695 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.fix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
diff --git a/pkgs/servers/http/apache-httpd/default.fix b/pkgs/servers/http/apache-httpd/default.nix
index b0e9dd2e9c0f7..b0e9dd2e9c0f7 100644
--- a/pkgs/servers/http/apache-httpd/default.fix
+++ b/pkgs/servers/http/apache-httpd/default.nix
diff --git a/pkgs/servers/x11/xfree86/default.fix b/pkgs/servers/x11/xfree86/default.nix
index 17971c2081fd6..17971c2081fd6 100644
--- a/pkgs/servers/x11/xfree86/default.fix
+++ b/pkgs/servers/x11/xfree86/default.nix
diff --git a/pkgs/shells/bash/default.fix b/pkgs/shells/bash/default.nix
index 9219956590416..9219956590416 100644
--- a/pkgs/shells/bash/default.fix
+++ b/pkgs/shells/bash/default.nix
diff --git a/pkgs/stdenv/generic/default.fix b/pkgs/stdenv/generic/default.nix
index 6778b4d131cc0..6778b4d131cc0 100644
--- a/pkgs/stdenv/generic/default.fix
+++ b/pkgs/stdenv/generic/default.nix
diff --git a/pkgs/stdenv/native/default.fix b/pkgs/stdenv/native/default.nix
index 2859cc18d0e1a..2859cc18d0e1a 100644
--- a/pkgs/stdenv/native/default.fix
+++ b/pkgs/stdenv/native/default.nix
diff --git a/pkgs/stdenv/nix-linux/boot.fix b/pkgs/stdenv/nix-linux/boot.nix
index c42b3f33302af..c42b3f33302af 100644
--- a/pkgs/stdenv/nix-linux/boot.fix
+++ b/pkgs/stdenv/nix-linux/boot.nix
diff --git a/pkgs/stdenv/nix-linux/default.fix b/pkgs/stdenv/nix-linux/default.nix
index 305a908186958..b4a1d357aad91 100644
--- a/pkgs/stdenv/nix-linux/default.fix
+++ b/pkgs/stdenv/nix-linux/default.nix
@@ -3,7 +3,7 @@
   system = bootStdenv.system;
   prehook = ./prehook.sh;
   posthook = ./posthook.sh;
-  initialPath = (import ../nix/path.fix) {pkgs = pkgs};
+  initialPath = (import ../nix/path.nix) {pkgs = pkgs};
   param1 = pkgs.bash;
   param2 = pkgs.gcc;
   param3 = pkgs.binutils;
diff --git a/pkgs/stdenv/nix/default.fix b/pkgs/stdenv/nix/default.nix
index e7f343d375f5c..16f07b4a36656 100644
--- a/pkgs/stdenv/nix/default.fix
+++ b/pkgs/stdenv/nix/default.nix
@@ -3,7 +3,7 @@
   system = bootStdenv.system;
   prehook = ./prehook.sh;
   posthook = ./posthook.sh;
-  initialPath = (import ./path.fix) {pkgs = pkgs};
+  initialPath = (import ./path.nix) {pkgs = pkgs};
   param1 = pkgs.bash;
   param2 = pkgs.gcc;
   param3 = pkgs.binutils;
diff --git a/pkgs/stdenv/nix/path.fix b/pkgs/stdenv/nix/path.nix
index b3348cb0f3500..b3348cb0f3500 100644
--- a/pkgs/stdenv/nix/path.fix
+++ b/pkgs/stdenv/nix/path.nix
diff --git a/pkgs/system/all-packages-generic.fix b/pkgs/system/all-packages-generic.nix
index d469af8c67847..d469af8c67847 100644
--- a/pkgs/system/all-packages-generic.fix
+++ b/pkgs/system/all-packages-generic.nix
diff --git a/pkgs/system/all-packages.fix b/pkgs/system/all-packages.nix
index d0228c3da1e99..28f769f847863 100644
--- a/pkgs/system/all-packages.fix
+++ b/pkgs/system/all-packages.nix
@@ -1,7 +1,7 @@
 # This file evaluates to a function that, when supplied with a system
 # identifier, returns the set of all packages provided by the Nix
 # Package Collection.  It does this by supplying
-# `all-packages-generic.fix' with a standard build environment.
+# `all-packages-generic.nix' with a standard build environment.
 #
 # On Linux systems, the standard build environment consists of
 # Nix-built instances glibc and the `standard' Unix tools, i.e., the
@@ -9,7 +9,7 @@
 # we use the native C library.
 
 {system}: let {
-  allPackages = import ./all-packages-generic.fix;
+  allPackages = import ./all-packages-generic.nix;
 
   # The native (i.e., impure) build environment.  This one uses the
   # tools installed on the system outside of the Nix environment,
@@ -29,7 +29,7 @@
   # The Linux build environment consists of the Nix build environment
   # built against the GNU C Library.
   stdenvLinuxGlibc = stdenvNativePkgs.glibc;
-  stdenvLinuxBoot = (import ../stdenv/nix-linux/boot.fix) {
+  stdenvLinuxBoot = (import ../stdenv/nix-linux/boot.nix) {
     system = system;
     glibc = stdenvLinuxGlibc;
   };
diff --git a/pkgs/system/i686-suse-linux.fix b/pkgs/system/i686-suse-linux.fix
deleted file mode 100644
index bb5128277998e..0000000000000
--- a/pkgs/system/i686-suse-linux.fix
+++ /dev/null
@@ -1 +0,0 @@
-(import ./user-environment.fix) {system = "i686-suse-linux"}
diff --git a/pkgs/system/i686-suse-linux.nix b/pkgs/system/i686-suse-linux.nix
new file mode 100644
index 0000000000000..643d2ad2c9235
--- /dev/null
+++ b/pkgs/system/i686-suse-linux.nix
@@ -0,0 +1 @@
+(import ./user-environment.nix) {system = "i686-suse-linux"}
diff --git a/pkgs/system/user-environment.fix b/pkgs/system/user-environment.nix
index 98268c4d76dd8..60b2293a13fdc 100644
--- a/pkgs/system/user-environment.fix
+++ b/pkgs/system/user-environment.nix
@@ -5,7 +5,7 @@
 
 {system}: let {
   # All activated packages.
-  pkgs = (import ./all-packages.fix) {system = system};
+  pkgs = (import ./all-packages.nix) {system = system};
 
   # The packages selection for inclusion in the user environment.
   # This list should be generated automatically by a package
diff --git a/pkgs/tools/archivers/gnutar/default.fix b/pkgs/tools/archivers/gnutar/default.nix
index b7c18e872ad96..b7c18e872ad96 100644
--- a/pkgs/tools/archivers/gnutar/default.fix
+++ b/pkgs/tools/archivers/gnutar/default.nix
diff --git a/pkgs/tools/archivers/zip/default.fix b/pkgs/tools/archivers/zip/default.nix
index 7b4ea02fb4055..7b4ea02fb4055 100644
--- a/pkgs/tools/archivers/zip/default.fix
+++ b/pkgs/tools/archivers/zip/default.nix
diff --git a/pkgs/tools/compression/bzip2/default.fix b/pkgs/tools/compression/bzip2/default.nix
index 1684edd1659fd..1684edd1659fd 100644
--- a/pkgs/tools/compression/bzip2/default.fix
+++ b/pkgs/tools/compression/bzip2/default.nix
diff --git a/pkgs/tools/compression/gzip/default.fix b/pkgs/tools/compression/gzip/default.nix
index a5902361fe7fe..a5902361fe7fe 100644
--- a/pkgs/tools/compression/gzip/default.fix
+++ b/pkgs/tools/compression/gzip/default.nix
diff --git a/pkgs/tools/misc/coreutils/default.fix b/pkgs/tools/misc/coreutils/default.nix
index d5a4b72955693..d5a4b72955693 100644
--- a/pkgs/tools/misc/coreutils/default.fix
+++ b/pkgs/tools/misc/coreutils/default.nix
diff --git a/pkgs/tools/misc/findutils/default.fix b/pkgs/tools/misc/findutils/default.nix
index 957aef5e0e4b8..957aef5e0e4b8 100644
--- a/pkgs/tools/misc/findutils/default.fix
+++ b/pkgs/tools/misc/findutils/default.nix
diff --git a/pkgs/tools/networking/wget/default.fix b/pkgs/tools/networking/wget/default.nix
index d0b7d01c1de80..d0b7d01c1de80 100644
--- a/pkgs/tools/networking/wget/default.fix
+++ b/pkgs/tools/networking/wget/default.nix
diff --git a/pkgs/tools/text/diffutils/default.fix b/pkgs/tools/text/diffutils/default.nix
index bbf1990f7131e..bbf1990f7131e 100644
--- a/pkgs/tools/text/diffutils/default.fix
+++ b/pkgs/tools/text/diffutils/default.nix
diff --git a/pkgs/tools/text/ed/default.fix b/pkgs/tools/text/ed/default.nix
index 1f79383e0581a..1f79383e0581a 100644
--- a/pkgs/tools/text/ed/default.fix
+++ b/pkgs/tools/text/ed/default.nix
diff --git a/pkgs/tools/text/gawk/default.fix b/pkgs/tools/text/gawk/default.nix
index 85de9289dd068..85de9289dd068 100644
--- a/pkgs/tools/text/gawk/default.fix
+++ b/pkgs/tools/text/gawk/default.nix
diff --git a/pkgs/tools/text/gnugrep/default.fix b/pkgs/tools/text/gnugrep/default.nix
index b526c81fa7769..b526c81fa7769 100644
--- a/pkgs/tools/text/gnugrep/default.fix
+++ b/pkgs/tools/text/gnugrep/default.nix
diff --git a/pkgs/tools/text/gnused/default.fix b/pkgs/tools/text/gnused/default.nix
index a92b3996515d1..a92b3996515d1 100644
--- a/pkgs/tools/text/gnused/default.fix
+++ b/pkgs/tools/text/gnused/default.nix