From 63bd7cdb79bb0514d90e5b87e5d8f7715050285b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 21 Feb 2005 20:54:34 +0000 Subject: [PATCH] * Rename stdenv-nix-linux-static to stdenv-linux. svn path=/nixpkgs/trunk/; revision=2264 --- .../bash-static/bash | Bin .../bash-static/builder.sh | 0 .../bash-static/default.nix | 0 .../binutils-static/builder.sh | 0 .../binutils-static/default.nix | 0 .../bzip2-static/builder.sh | 0 .../bzip2-static/default.nix | 0 .../coreutils-static/builder.sh | 0 .../coreutils-static/default.nix | 0 .../curl-static/builder.sh | 0 .../curl-static/curl-7.12.2-static.tar.gz | Bin .../curl-static/default.nix | 0 .../{nix-linux-static => linux}/default.nix | 0 .../diffutils-static/builder.sh | 0 .../diffutils-static/default.nix | 0 .../findutils-static/builder.sh | 0 .../findutils-static/default.nix | 0 .../gawk-static/builder.sh | 0 .../gawk-static/default.nix | 0 .../gcc-static/builder.sh | 0 .../gcc-static/default.nix | 0 .../gnugrep-static/builder.sh | 0 .../gnugrep-static/default.nix | 0 .../gnumake-static/builder.sh | 0 .../gnumake-static/default.nix | 0 .../gnused-static/builder.sh | 0 .../gnused-static/default.nix | 0 .../gnutar-static/bin/tar | Bin .../gnutar-static/builder.sh | 0 .../gnutar-static/default.nix | 0 .../gzip-static/bin/gunzip | Bin .../gzip-static/bin/gzip | Bin .../gzip-static/builder.sh | 0 .../gzip-static/default.nix | 0 .../patchelf-static/bin/patchelf | Bin pkgs/stdenv/linux/path.nix | 13 ++++ pkgs/stdenv/linux/pkgs.nix | 64 ++++++++++++++++++ .../{nix-linux-static => linux}/prehook.sh | 0 .../scripts/add-symlink.sh | 0 .../scripts/builder-stdenv-initial.sh | 0 .../scripts/curl-unpack | 0 .../scripts/download-script | 0 .../scripts/fix-outpath.sh | 0 .../{nix-linux-static => linux}/tools/cp | Bin pkgs/system/stdenvs.nix | 5 +- 45 files changed, 80 insertions(+), 2 deletions(-) rename pkgs/stdenv/{nix-linux-static => linux}/bash-static/bash (100%) rename pkgs/stdenv/{nix-linux-static => linux}/bash-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/bash-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/binutils-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/binutils-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/bzip2-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/bzip2-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/coreutils-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/coreutils-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/curl-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/curl-static/curl-7.12.2-static.tar.gz (100%) rename pkgs/stdenv/{nix-linux-static => linux}/curl-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/diffutils-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/diffutils-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/findutils-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/findutils-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gawk-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gawk-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gcc-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gcc-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gnugrep-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gnugrep-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gnumake-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gnumake-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gnused-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gnused-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gnutar-static/bin/tar (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gnutar-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gnutar-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gzip-static/bin/gunzip (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gzip-static/bin/gzip (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gzip-static/builder.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/gzip-static/default.nix (100%) rename pkgs/stdenv/{nix-linux-static => linux}/patchelf-static/bin/patchelf (100%) create mode 100644 pkgs/stdenv/linux/path.nix create mode 100644 pkgs/stdenv/linux/pkgs.nix rename pkgs/stdenv/{nix-linux-static => linux}/prehook.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/scripts/add-symlink.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/scripts/builder-stdenv-initial.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/scripts/curl-unpack (100%) rename pkgs/stdenv/{nix-linux-static => linux}/scripts/download-script (100%) rename pkgs/stdenv/{nix-linux-static => linux}/scripts/fix-outpath.sh (100%) rename pkgs/stdenv/{nix-linux-static => linux}/tools/cp (100%) diff --git a/pkgs/stdenv/nix-linux-static/bash-static/bash b/pkgs/stdenv/linux/bash-static/bash similarity index 100% rename from pkgs/stdenv/nix-linux-static/bash-static/bash rename to pkgs/stdenv/linux/bash-static/bash diff --git a/pkgs/stdenv/nix-linux-static/bash-static/builder.sh b/pkgs/stdenv/linux/bash-static/builder.sh similarity index 100% rename from pkgs/stdenv/nix-linux-static/bash-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/bash-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/binutils-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/binutils-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/bzip2-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/bzip2-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/coreutils-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/coreutils-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/curl-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/curl-static/curl-7.12.2-static.tar.gz rename to pkgs/stdenv/linux/curl-static/curl-7.12.2-static.tar.gz diff --git a/pkgs/stdenv/nix-linux-static/curl-static/default.nix b/pkgs/stdenv/linux/curl-static/default.nix similarity index 100% rename from pkgs/stdenv/nix-linux-static/curl-static/default.nix rename to pkgs/stdenv/linux/curl-static/default.nix diff --git a/pkgs/stdenv/nix-linux-static/default.nix b/pkgs/stdenv/linux/default.nix similarity index 100% rename from pkgs/stdenv/nix-linux-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/diffutils-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/diffutils-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/findutils-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/findutils-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gawk-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gawk-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gcc-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gcc-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gnugrep-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gnugrep-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gnumake-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gnumake-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gnused-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gnused-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gnutar-static/bin/tar rename to pkgs/stdenv/linux/gnutar-static/bin/tar diff --git a/pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh b/pkgs/stdenv/linux/gnutar-static/builder.sh similarity index 100% rename from pkgs/stdenv/nix-linux-static/gnutar-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gnutar-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gzip-static/bin/gunzip rename to pkgs/stdenv/linux/gzip-static/bin/gunzip diff --git a/pkgs/stdenv/nix-linux-static/gzip-static/bin/gzip b/pkgs/stdenv/linux/gzip-static/bin/gzip similarity index 100% rename from pkgs/stdenv/nix-linux-static/gzip-static/bin/gzip rename to pkgs/stdenv/linux/gzip-static/bin/gzip diff --git a/pkgs/stdenv/nix-linux-static/gzip-static/builder.sh b/pkgs/stdenv/linux/gzip-static/builder.sh similarity index 100% rename from pkgs/stdenv/nix-linux-static/gzip-static/builder.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/gzip-static/default.nix rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/patchelf-static/bin/patchelf rename to pkgs/stdenv/linux/patchelf-static/bin/patchelf diff --git a/pkgs/stdenv/linux/path.nix b/pkgs/stdenv/linux/path.nix new file mode 100644 index 00000000000..01b23f95097 --- /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 00000000000..52193ac526f --- /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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/prehook.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/scripts/add-symlink.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/scripts/builder-stdenv-initial.sh rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/scripts/curl-unpack rename to pkgs/stdenv/linux/scripts/curl-unpack diff --git a/pkgs/stdenv/nix-linux-static/scripts/download-script b/pkgs/stdenv/linux/scripts/download-script similarity index 100% rename from pkgs/stdenv/nix-linux-static/scripts/download-script rename to 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 similarity index 100% rename from pkgs/stdenv/nix-linux-static/scripts/fix-outpath.sh rename to pkgs/stdenv/linux/scripts/fix-outpath.sh diff --git a/pkgs/stdenv/nix-linux-static/tools/cp b/pkgs/stdenv/linux/tools/cp similarity index 100% rename from pkgs/stdenv/nix-linux-static/tools/cp rename to pkgs/stdenv/linux/tools/cp diff --git a/pkgs/system/stdenvs.nix b/pkgs/system/stdenvs.nix index 9127c6793c3..649fa149cce 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) {