* Rename stdenv-nix-linux-static to stdenv-linux.

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

pkgs/stdenv/linux/path.nix

@@ -0,0 +1,13 @@
+{pkgs}: [
+  pkgs.coreutils
+  pkgs.findutils
+  pkgs.diffutils
+  pkgs.gnused
+  pkgs.gnugrep
+  pkgs.gawk
+  pkgs.gnutar
+  pkgs.gzip
+  pkgs.bzip2
+  pkgs.gnumake
+  pkgs.bash
+]

pkgs/stdenv/linux/pkgs.nix

@@ -0,0 +1,64 @@
+{stdenv}:
+
+rec {
+
+  inherit stdenv;
+
+   curl = (import ./curl-static) {
+     inherit stdenv;
+   };
+
+   ### TOOLS
+   coreutils = (import ./coreutils-static) {
+     inherit stdenv gnutar gzip curl;
+   };
+
+   findutils = (import ./findutils-static) {
+     inherit stdenv gnutar gzip curl;
+   };
+
+   diffutils = (import ./diffutils-static) {
+     inherit stdenv gnutar gzip curl;
+   };
+
+   gnused = (import ./gnused-static) {
+     inherit stdenv gnutar gzip curl;
+   };
+
+   gnugrep = (import ./gnugrep-static) {
+     inherit stdenv gnutar gzip curl;
+   };
+
+   gawk = (import ./gawk-static) {
+     inherit stdenv gnutar gzip curl;
+   };
+
+   gnutar = (import ./gnutar-static) {
+     inherit stdenv;
+   };
+
+   gzip = (import ./gzip-static) {
+     inherit stdenv;
+   };
+
+   bzip2 = (import ./bzip2-static) {
+     inherit stdenv gnutar gzip curl;
+   };
+
+   binutils = (import ./binutils-static) {
+     inherit stdenv gnutar gzip curl;
+   };
+
+   gnumake = (import ./gnumake-static) {
+     inherit stdenv gnutar gzip curl;
+   };
+
+   gcc = (import ./gcc-static) {
+     inherit stdenv;
+   };
+
+   bash = (import ./bash-static) {
+     inherit stdenv;
+   };
+
+}

pkgs/system/stdenvs.nix

@@ -50,9 +50,10 @@
 
 
   # Linux standard environment.
-  inherit (import ../stdenv/nix-linux-static) stdenvLinux stdenvLinuxPkgs;
-
+  inherit (import ../stdenv/linux {inherit allPackages;})
+    stdenvLinux stdenvLinuxPkgs;
 
+    
   # Darwin (Mac OS X) standard environment.  Very simple for now
   # (essentially it's just the native environment).
   stdenvDarwin = (import ../stdenv/darwin) {