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

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

45 files changed, 80 insertions, 2 deletions

diff --git a/pkgs/stdenv/nix-linux-static/bash-static/bash b/pkgs/stdenv/linux/bash-static/bash
index 77ff01cf186e6..77ff01cf186e6 100755
--- a/pkgs/stdenv/nix-linux-static/bash-static/bash
+++ b/pkgs/stdenv/linux/bash-static/bash
Binary files differdiff --git a/pkgs/stdenv/nix-linux-static/bash-static/builder.sh b/pkgs/stdenv/linux/bash-static/builder.sh
index 542594297f84a..542594297f84a 100644
--- a/pkgs/stdenv/nix-linux-static/bash-static/builder.sh
+++ b/pkgs/stdenv/linux/bash-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/bash-static/default.nix b/pkgs/stdenv/linux/bash-static/default.nix
index 55c9b2faa0eb3..55c9b2faa0eb3 100644
--- a/pkgs/stdenv/nix-linux-static/bash-static/default.nix
+++ b/pkgs/stdenv/linux/bash-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/binutils-static/builder.sh b/pkgs/stdenv/linux/binutils-static/builder.sh
index ede1a5d2258af..ede1a5d2258af 100644
--- a/pkgs/stdenv/nix-linux-static/binutils-static/builder.sh
+++ b/pkgs/stdenv/linux/binutils-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/binutils-static/default.nix b/pkgs/stdenv/linux/binutils-static/default.nix
index 58607b8da8b6e..58607b8da8b6e 100644
--- a/pkgs/stdenv/nix-linux-static/binutils-static/default.nix
+++ b/pkgs/stdenv/linux/binutils-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/bzip2-static/builder.sh b/pkgs/stdenv/linux/bzip2-static/builder.sh
index 1bdc263489690..1bdc263489690 100644
--- a/pkgs/stdenv/nix-linux-static/bzip2-static/builder.sh
+++ b/pkgs/stdenv/linux/bzip2-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/bzip2-static/default.nix b/pkgs/stdenv/linux/bzip2-static/default.nix
index 631850ca1eeaf..631850ca1eeaf 100644
--- a/pkgs/stdenv/nix-linux-static/bzip2-static/default.nix
+++ b/pkgs/stdenv/linux/bzip2-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/coreutils-static/builder.sh b/pkgs/stdenv/linux/coreutils-static/builder.sh
index 80ba81d451e0d..80ba81d451e0d 100644
--- a/pkgs/stdenv/nix-linux-static/coreutils-static/builder.sh
+++ b/pkgs/stdenv/linux/coreutils-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/coreutils-static/default.nix b/pkgs/stdenv/linux/coreutils-static/default.nix
index 89cf504353c02..89cf504353c02 100644
--- a/pkgs/stdenv/nix-linux-static/coreutils-static/default.nix
+++ b/pkgs/stdenv/linux/coreutils-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/curl-static/builder.sh b/pkgs/stdenv/linux/curl-static/builder.sh
index 213b82e1e2990..213b82e1e2990 100644
--- a/pkgs/stdenv/nix-linux-static/curl-static/builder.sh
+++ b/pkgs/stdenv/linux/curl-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/curl-static/curl-7.12.2-static.tar.gz b/pkgs/stdenv/linux/curl-static/curl-7.12.2-static.tar.gz
index 92e40e7ea194b..92e40e7ea194b 100644
--- a/pkgs/stdenv/nix-linux-static/curl-static/curl-7.12.2-static.tar.gz
+++ b/pkgs/stdenv/linux/curl-static/curl-7.12.2-static.tar.gz
Binary files differdiff --git a/pkgs/stdenv/nix-linux-static/curl-static/default.nix b/pkgs/stdenv/linux/curl-static/default.nix
index b61ce46bb97be..b61ce46bb97be 100644
--- a/pkgs/stdenv/nix-linux-static/curl-static/default.nix
+++ b/pkgs/stdenv/linux/curl-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/default.nix b/pkgs/stdenv/linux/default.nix
index f202f0ad7c77a..f202f0ad7c77a 100644
--- a/pkgs/stdenv/nix-linux-static/default.nix
+++ b/pkgs/stdenv/linux/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/diffutils-static/builder.sh b/pkgs/stdenv/linux/diffutils-static/builder.sh
index 603cc8ab7adcd..603cc8ab7adcd 100644
--- a/pkgs/stdenv/nix-linux-static/diffutils-static/builder.sh
+++ b/pkgs/stdenv/linux/diffutils-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/diffutils-static/default.nix b/pkgs/stdenv/linux/diffutils-static/default.nix
index 786dd873303fb..786dd873303fb 100644
--- a/pkgs/stdenv/nix-linux-static/diffutils-static/default.nix
+++ b/pkgs/stdenv/linux/diffutils-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/findutils-static/builder.sh b/pkgs/stdenv/linux/findutils-static/builder.sh
index 9d5ac179ed1cc..9d5ac179ed1cc 100644
--- a/pkgs/stdenv/nix-linux-static/findutils-static/builder.sh
+++ b/pkgs/stdenv/linux/findutils-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/findutils-static/default.nix b/pkgs/stdenv/linux/findutils-static/default.nix
index 98b4691503eb5..98b4691503eb5 100644
--- a/pkgs/stdenv/nix-linux-static/findutils-static/default.nix
+++ b/pkgs/stdenv/linux/findutils-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/gawk-static/builder.sh b/pkgs/stdenv/linux/gawk-static/builder.sh
index 8d55abd587d69..8d55abd587d69 100644
--- a/pkgs/stdenv/nix-linux-static/gawk-static/builder.sh
+++ b/pkgs/stdenv/linux/gawk-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/gawk-static/default.nix b/pkgs/stdenv/linux/gawk-static/default.nix
index e85111dbc44ac..e85111dbc44ac 100644
--- a/pkgs/stdenv/nix-linux-static/gawk-static/default.nix
+++ b/pkgs/stdenv/linux/gawk-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/gcc-static/builder.sh b/pkgs/stdenv/linux/gcc-static/builder.sh
index 982d725410638..982d725410638 100644
--- a/pkgs/stdenv/nix-linux-static/gcc-static/builder.sh
+++ b/pkgs/stdenv/linux/gcc-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/gcc-static/default.nix b/pkgs/stdenv/linux/gcc-static/default.nix
index b930807c209d6..b930807c209d6 100644
--- a/pkgs/stdenv/nix-linux-static/gcc-static/default.nix
+++ b/pkgs/stdenv/linux/gcc-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/gnugrep-static/builder.sh b/pkgs/stdenv/linux/gnugrep-static/builder.sh
index 8290f078df39d..8290f078df39d 100644
--- a/pkgs/stdenv/nix-linux-static/gnugrep-static/builder.sh
+++ b/pkgs/stdenv/linux/gnugrep-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/gnugrep-static/default.nix b/pkgs/stdenv/linux/gnugrep-static/default.nix
index e2c047ee3cc63..e2c047ee3cc63 100644
--- a/pkgs/stdenv/nix-linux-static/gnugrep-static/default.nix
+++ b/pkgs/stdenv/linux/gnugrep-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/gnumake-static/builder.sh b/pkgs/stdenv/linux/gnumake-static/builder.sh
index a0e79c73065b4..a0e79c73065b4 100644
--- a/pkgs/stdenv/nix-linux-static/gnumake-static/builder.sh
+++ b/pkgs/stdenv/linux/gnumake-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/gnumake-static/default.nix b/pkgs/stdenv/linux/gnumake-static/default.nix
index f1df6b2074b0c..f1df6b2074b0c 100644
--- a/pkgs/stdenv/nix-linux-static/gnumake-static/default.nix
+++ b/pkgs/stdenv/linux/gnumake-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/gnused-static/builder.sh b/pkgs/stdenv/linux/gnused-static/builder.sh
index b32cafc8a0e2f..b32cafc8a0e2f 100644
--- a/pkgs/stdenv/nix-linux-static/gnused-static/builder.sh
+++ b/pkgs/stdenv/linux/gnused-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/gnused-static/default.nix b/pkgs/stdenv/linux/gnused-static/default.nix
index e22a28efdfe0a..e22a28efdfe0a 100644
--- a/pkgs/stdenv/nix-linux-static/gnused-static/default.nix
+++ b/pkgs/stdenv/linux/gnused-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/gnutar-static/bin/tar b/pkgs/stdenv/linux/gnutar-static/bin/tar
index a001a9c988408..a001a9c988408 100755
--- a/pkgs/stdenv/nix-linux-static/gnutar-static/bin/tar
+++ b/pkgs/stdenv/linux/gnutar-static/bin/tar
Binary files differdiff --git a/pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh b/pkgs/stdenv/linux/gnutar-static/builder.sh
index 42f0d6e16103e..42f0d6e16103e 100644
--- a/pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh
+++ b/pkgs/stdenv/linux/gnutar-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/gnutar-static/default.nix b/pkgs/stdenv/linux/gnutar-static/default.nix
index 539fd73ffa4dd..539fd73ffa4dd 100644
--- a/pkgs/stdenv/nix-linux-static/gnutar-static/default.nix
+++ b/pkgs/stdenv/linux/gnutar-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/gzip-static/bin/gunzip b/pkgs/stdenv/linux/gzip-static/bin/gunzip
index c6059153306e3..c6059153306e3 100755
--- a/pkgs/stdenv/nix-linux-static/gzip-static/bin/gunzip
+++ b/pkgs/stdenv/linux/gzip-static/bin/gunzip
Binary files differdiff --git a/pkgs/stdenv/nix-linux-static/gzip-static/bin/gzip b/pkgs/stdenv/linux/gzip-static/bin/gzip
index c6059153306e3..c6059153306e3 100755
--- a/pkgs/stdenv/nix-linux-static/gzip-static/bin/gzip
+++ b/pkgs/stdenv/linux/gzip-static/bin/gzip
Binary files differdiff --git a/pkgs/stdenv/nix-linux-static/gzip-static/builder.sh b/pkgs/stdenv/linux/gzip-static/builder.sh
index 42f0d6e16103e..42f0d6e16103e 100644
--- a/pkgs/stdenv/nix-linux-static/gzip-static/builder.sh
+++ b/pkgs/stdenv/linux/gzip-static/builder.sh
diff --git a/pkgs/stdenv/nix-linux-static/gzip-static/default.nix b/pkgs/stdenv/linux/gzip-static/default.nix
index 68824c5611069..68824c5611069 100644
--- a/pkgs/stdenv/nix-linux-static/gzip-static/default.nix
+++ b/pkgs/stdenv/linux/gzip-static/default.nix
diff --git a/pkgs/stdenv/nix-linux-static/patchelf-static/bin/patchelf b/pkgs/stdenv/linux/patchelf-static/bin/patchelf
index d0ac6a22f61a9..d0ac6a22f61a9 100755
--- a/pkgs/stdenv/nix-linux-static/patchelf-static/bin/patchelf
+++ b/pkgs/stdenv/linux/patchelf-static/bin/patchelf
Binary files differdiff --git a/pkgs/stdenv/linux/path.nix b/pkgs/stdenv/linux/path.nix
new file mode 100644
index 0000000000000..01b23f950976a
--- /dev/null
+++ b/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
+]
diff --git a/pkgs/stdenv/linux/pkgs.nix b/pkgs/stdenv/linux/pkgs.nix
new file mode 100644
index 0000000000000..52193ac526fa6
--- /dev/null
+++ b/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;
+   };
+
+}
diff --git a/pkgs/stdenv/nix-linux-static/prehook.sh b/pkgs/stdenv/linux/prehook.sh
index 4ba81f1eef74c..4ba81f1eef74c 100644
--- a/pkgs/stdenv/nix-linux-static/prehook.sh
+++ b/pkgs/stdenv/linux/prehook.sh
diff --git a/pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh b/pkgs/stdenv/linux/scripts/add-symlink.sh
index ff2716f21d3dc..ff2716f21d3dc 100644
--- a/pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh
+++ b/pkgs/stdenv/linux/scripts/add-symlink.sh
diff --git a/pkgs/stdenv/nix-linux-static/scripts/builder-stdenv-initial.sh b/pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh
index bb9728af6dd1b..bb9728af6dd1b 100644
--- a/pkgs/stdenv/nix-linux-static/scripts/builder-stdenv-initial.sh
+++ b/pkgs/stdenv/linux/scripts/builder-stdenv-initial.sh
diff --git a/pkgs/stdenv/nix-linux-static/scripts/curl-unpack b/pkgs/stdenv/linux/scripts/curl-unpack
index b62465e5e56c2..b62465e5e56c2 100644
--- a/pkgs/stdenv/nix-linux-static/scripts/curl-unpack
+++ b/pkgs/stdenv/linux/scripts/curl-unpack
diff --git a/pkgs/stdenv/nix-linux-static/scripts/download-script b/pkgs/stdenv/linux/scripts/download-script
index a3cf210df15a4..a3cf210df15a4 100644
--- a/pkgs/stdenv/nix-linux-static/scripts/download-script
+++ b/pkgs/stdenv/linux/scripts/download-script
diff --git a/pkgs/stdenv/nix-linux-static/scripts/fix-outpath.sh b/pkgs/stdenv/linux/scripts/fix-outpath.sh
index be0df6b07795f..be0df6b07795f 100644
--- a/pkgs/stdenv/nix-linux-static/scripts/fix-outpath.sh
+++ b/pkgs/stdenv/linux/scripts/fix-outpath.sh
diff --git a/pkgs/stdenv/nix-linux-static/tools/cp b/pkgs/stdenv/linux/tools/cp
index b5974d88350a5..b5974d88350a5 100755
--- a/pkgs/stdenv/nix-linux-static/tools/cp
+++ b/pkgs/stdenv/linux/tools/cp
Binary files differdiff --git a/pkgs/system/stdenvs.nix b/pkgs/system/stdenvs.nix
index 9127c6793c3e4..649fa149cce6f 100644
--- a/pkgs/system/stdenvs.nix
+++ b/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) {