diff --git a/pkgs/applications/graphics/gqview/default.fix b/pkgs/applications/graphics/gqview/default.nix similarity index 100% rename from pkgs/applications/graphics/gqview/default.fix rename to pkgs/applications/graphics/gqview/default.nix diff --git a/pkgs/applications/networking/browsers/firebird/default.fix b/pkgs/applications/networking/browsers/firebird/default.nix similarity index 100% rename from pkgs/applications/networking/browsers/firebird/default.fix rename to 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 similarity index 100% rename from pkgs/applications/networking/mailreaders/sylpheed/default.fix rename to 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 similarity index 100% rename from pkgs/applications/networking/newsreaders/pan/default.fix rename to 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 similarity index 100% rename from pkgs/applications/version-management/subversion/default.fix rename to pkgs/applications/version-management/subversion/default.nix diff --git a/pkgs/applications/video/MPlayer/default.fix b/pkgs/applications/video/MPlayer/default.nix similarity index 100% rename from pkgs/applications/video/MPlayer/default.fix rename to pkgs/applications/video/MPlayer/default.nix diff --git a/pkgs/applications/video/MPlayer/win32codecs/default.fix b/pkgs/applications/video/MPlayer/win32codecs/default.nix similarity index 100% rename from pkgs/applications/video/MPlayer/win32codecs/default.fix rename to 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 similarity index 100% rename from pkgs/applications/video/mplayerplug-in/default.fix rename to pkgs/applications/video/mplayerplug-in/default.nix diff --git a/pkgs/build-support/fetchurl/default.fix b/pkgs/build-support/fetchurl/default.nix similarity index 100% rename from pkgs/build-support/fetchurl/default.fix rename to pkgs/build-support/fetchurl/default.nix diff --git a/pkgs/development/compilers/gcc/default.fix b/pkgs/development/compilers/gcc/default.nix similarity index 100% rename from pkgs/development/compilers/gcc/default.fix rename to pkgs/development/compilers/gcc/default.nix diff --git a/pkgs/development/interpreters/perl/default.fix b/pkgs/development/interpreters/perl/default.nix similarity index 100% rename from pkgs/development/interpreters/perl/default.fix rename to pkgs/development/interpreters/perl/default.nix diff --git a/pkgs/development/libraries/aterm/default.fix b/pkgs/development/libraries/aterm/default.nix similarity index 100% rename from pkgs/development/libraries/aterm/default.fix rename to pkgs/development/libraries/aterm/default.nix diff --git a/pkgs/development/libraries/db4/default.fix b/pkgs/development/libraries/db4/default.nix similarity index 100% rename from pkgs/development/libraries/db4/default.fix rename to pkgs/development/libraries/db4/default.nix diff --git a/pkgs/development/libraries/expat/default.fix b/pkgs/development/libraries/expat/default.nix similarity index 100% rename from pkgs/development/libraries/expat/default.fix rename to pkgs/development/libraries/expat/default.nix diff --git a/pkgs/development/libraries/fontconfig/default.fix b/pkgs/development/libraries/fontconfig/default.nix similarity index 100% rename from pkgs/development/libraries/fontconfig/default.fix rename to pkgs/development/libraries/fontconfig/default.nix diff --git a/pkgs/development/libraries/freetype/default.fix b/pkgs/development/libraries/freetype/default.nix similarity index 100% rename from pkgs/development/libraries/freetype/default.fix rename to pkgs/development/libraries/freetype/default.nix diff --git a/pkgs/development/libraries/gettext/default.fix b/pkgs/development/libraries/gettext/default.nix similarity index 100% rename from pkgs/development/libraries/gettext/default.fix rename to pkgs/development/libraries/gettext/default.nix diff --git a/pkgs/development/libraries/glibc/default.fix b/pkgs/development/libraries/glibc/default.nix similarity index 100% rename from pkgs/development/libraries/glibc/default.fix rename to pkgs/development/libraries/glibc/default.nix diff --git a/pkgs/development/libraries/gnet/default.fix b/pkgs/development/libraries/gnet/default.nix similarity index 100% rename from pkgs/development/libraries/gnet/default.fix rename to 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 similarity index 100% rename from pkgs/development/libraries/gtk+-1/gdk-pixbuf/default.fix rename to 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 similarity index 100% rename from pkgs/development/libraries/gtk+-1/glib/default.fix rename to 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 similarity index 100% rename from pkgs/development/libraries/gtk+-1/gtk+/default.fix rename to 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 similarity index 100% rename from pkgs/development/libraries/gtk+/atk/default.fix rename to 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 similarity index 100% rename from pkgs/development/libraries/gtk+/glib/default.fix rename to 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 similarity index 100% rename from pkgs/development/libraries/gtk+/gtk+/default.fix rename to 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 similarity index 100% rename from pkgs/development/libraries/gtk+/pango/default.fix rename to pkgs/development/libraries/gtk+/pango/default.nix diff --git a/pkgs/development/libraries/libIDL/default.fix b/pkgs/development/libraries/libIDL/default.nix similarity index 100% rename from pkgs/development/libraries/libIDL/default.fix rename to pkgs/development/libraries/libIDL/default.nix diff --git a/pkgs/development/libraries/libjpeg/default.fix b/pkgs/development/libraries/libjpeg/default.nix similarity index 100% rename from pkgs/development/libraries/libjpeg/default.fix rename to pkgs/development/libraries/libjpeg/default.nix diff --git a/pkgs/development/libraries/libpng/default.fix b/pkgs/development/libraries/libpng/default.nix similarity index 100% rename from pkgs/development/libraries/libpng/default.fix rename to pkgs/development/libraries/libpng/default.nix diff --git a/pkgs/development/libraries/libtiff/default.fix b/pkgs/development/libraries/libtiff/default.nix similarity index 100% rename from pkgs/development/libraries/libtiff/default.fix rename to pkgs/development/libraries/libtiff/default.nix diff --git a/pkgs/development/libraries/libxml2/default.fix b/pkgs/development/libraries/libxml2/default.nix similarity index 100% rename from pkgs/development/libraries/libxml2/default.fix rename to pkgs/development/libraries/libxml2/default.nix diff --git a/pkgs/development/libraries/openssl/default.fix b/pkgs/development/libraries/openssl/default.nix similarity index 100% rename from pkgs/development/libraries/openssl/default.fix rename to pkgs/development/libraries/openssl/default.nix diff --git a/pkgs/development/libraries/pcre/default.fix b/pkgs/development/libraries/pcre/default.nix similarity index 100% rename from pkgs/development/libraries/pcre/default.fix rename to pkgs/development/libraries/pcre/default.nix diff --git a/pkgs/development/libraries/xft/default.fix b/pkgs/development/libraries/xft/default.nix similarity index 100% rename from pkgs/development/libraries/xft/default.fix rename to pkgs/development/libraries/xft/default.nix diff --git a/pkgs/development/libraries/zlib/default.fix b/pkgs/development/libraries/zlib/default.nix similarity index 100% rename from pkgs/development/libraries/zlib/default.fix rename to 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 similarity index 100% rename from pkgs/development/tools/build-managers/gnumake/default.fix rename to 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 similarity index 100% rename from pkgs/development/tools/misc/binutils/default.fix rename to 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 similarity index 100% rename from pkgs/development/tools/misc/gnum4/default.fix rename to 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 similarity index 100% rename from pkgs/development/tools/misc/pkgconfig/default.fix rename to 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 similarity index 100% rename from pkgs/development/tools/parsing/bison/default.fix rename to 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 similarity index 100% rename from pkgs/development/tools/parsing/flex/default.fix rename to 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 similarity index 100% rename from pkgs/os-specific/linux/alsa/library/default.fix rename to 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 similarity index 100% rename from pkgs/os-specific/linux/kernel-headers/default.fix rename to 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 similarity index 100% rename from pkgs/servers/http/apache-httpd/default.fix rename to pkgs/servers/http/apache-httpd/default.nix diff --git a/pkgs/servers/x11/xfree86/default.fix b/pkgs/servers/x11/xfree86/default.nix similarity index 100% rename from pkgs/servers/x11/xfree86/default.fix rename to pkgs/servers/x11/xfree86/default.nix diff --git a/pkgs/shells/bash/default.fix b/pkgs/shells/bash/default.nix similarity index 100% rename from pkgs/shells/bash/default.fix rename to pkgs/shells/bash/default.nix diff --git a/pkgs/stdenv/generic/default.fix b/pkgs/stdenv/generic/default.nix similarity index 100% rename from pkgs/stdenv/generic/default.fix rename to pkgs/stdenv/generic/default.nix diff --git a/pkgs/stdenv/native/default.fix b/pkgs/stdenv/native/default.nix similarity index 100% rename from pkgs/stdenv/native/default.fix rename to pkgs/stdenv/native/default.nix diff --git a/pkgs/stdenv/nix-linux/boot.fix b/pkgs/stdenv/nix-linux/boot.nix similarity index 100% rename from pkgs/stdenv/nix-linux/boot.fix rename to pkgs/stdenv/nix-linux/boot.nix diff --git a/pkgs/stdenv/nix-linux/default.fix b/pkgs/stdenv/nix-linux/default.nix similarity index 83% rename from pkgs/stdenv/nix-linux/default.fix rename to pkgs/stdenv/nix-linux/default.nix index 305a9081869..b4a1d357aad 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 similarity index 84% rename from pkgs/stdenv/nix/default.fix rename to pkgs/stdenv/nix/default.nix index e7f343d375f..16f07b4a366 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 similarity index 100% rename from pkgs/stdenv/nix/path.fix rename to pkgs/stdenv/nix/path.nix diff --git a/pkgs/system/all-packages-generic.fix b/pkgs/system/all-packages-generic.nix similarity index 100% rename from pkgs/system/all-packages-generic.fix rename to pkgs/system/all-packages-generic.nix diff --git a/pkgs/system/all-packages.fix b/pkgs/system/all-packages.nix similarity index 90% rename from pkgs/system/all-packages.fix rename to pkgs/system/all-packages.nix index d0228c3da1e..28f769f8478 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 bb512827799..00000000000 --- 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 00000000000..643d2ad2c92 --- /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 similarity index 93% rename from pkgs/system/user-environment.fix rename to pkgs/system/user-environment.nix index 98268c4d76d..60b2293a13f 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 similarity index 100% rename from pkgs/tools/archivers/gnutar/default.fix rename to pkgs/tools/archivers/gnutar/default.nix diff --git a/pkgs/tools/archivers/zip/default.fix b/pkgs/tools/archivers/zip/default.nix similarity index 100% rename from pkgs/tools/archivers/zip/default.fix rename to pkgs/tools/archivers/zip/default.nix diff --git a/pkgs/tools/compression/bzip2/default.fix b/pkgs/tools/compression/bzip2/default.nix similarity index 100% rename from pkgs/tools/compression/bzip2/default.fix rename to pkgs/tools/compression/bzip2/default.nix diff --git a/pkgs/tools/compression/gzip/default.fix b/pkgs/tools/compression/gzip/default.nix similarity index 100% rename from pkgs/tools/compression/gzip/default.fix rename to pkgs/tools/compression/gzip/default.nix diff --git a/pkgs/tools/misc/coreutils/default.fix b/pkgs/tools/misc/coreutils/default.nix similarity index 100% rename from pkgs/tools/misc/coreutils/default.fix rename to pkgs/tools/misc/coreutils/default.nix diff --git a/pkgs/tools/misc/findutils/default.fix b/pkgs/tools/misc/findutils/default.nix similarity index 100% rename from pkgs/tools/misc/findutils/default.fix rename to pkgs/tools/misc/findutils/default.nix diff --git a/pkgs/tools/networking/wget/default.fix b/pkgs/tools/networking/wget/default.nix similarity index 100% rename from pkgs/tools/networking/wget/default.fix rename to pkgs/tools/networking/wget/default.nix diff --git a/pkgs/tools/text/diffutils/default.fix b/pkgs/tools/text/diffutils/default.nix similarity index 100% rename from pkgs/tools/text/diffutils/default.fix rename to pkgs/tools/text/diffutils/default.nix diff --git a/pkgs/tools/text/ed/default.fix b/pkgs/tools/text/ed/default.nix similarity index 100% rename from pkgs/tools/text/ed/default.fix rename to pkgs/tools/text/ed/default.nix diff --git a/pkgs/tools/text/gawk/default.fix b/pkgs/tools/text/gawk/default.nix similarity index 100% rename from pkgs/tools/text/gawk/default.fix rename to pkgs/tools/text/gawk/default.nix diff --git a/pkgs/tools/text/gnugrep/default.fix b/pkgs/tools/text/gnugrep/default.nix similarity index 100% rename from pkgs/tools/text/gnugrep/default.fix rename to pkgs/tools/text/gnugrep/default.nix diff --git a/pkgs/tools/text/gnused/default.fix b/pkgs/tools/text/gnused/default.nix similarity index 100% rename from pkgs/tools/text/gnused/default.fix rename to pkgs/tools/text/gnused/default.nix