diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/bzip2 b/pkgs/stdenv/linux/bootstrap/armv5tel/bzip2 deleted file mode 100755 index 5c9be292fe8..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/armv5tel/bzip2 and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/cpio b/pkgs/stdenv/linux/bootstrap/armv5tel/cpio deleted file mode 100755 index 3d69f9e5bd8..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/armv5tel/cpio and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/curl.bz2 b/pkgs/stdenv/linux/bootstrap/armv5tel/curl.bz2 deleted file mode 100755 index 1f2985bd347..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/armv5tel/curl.bz2 and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix index e8f04497bd9..6d18b3bd8cb 100644 --- a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix +++ b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix @@ -1,35 +1,11 @@ -let fetch = { file, sha256 }: - let - nixFetchurl = import ; - args = { - url = "file://${builtins.toString ./.}/${file}"; - inherit sha256; - executable = true; - }; - in if (builtins.functionArgs nixFetchurl) ? executable - then nixFetchurl args - else derivation { - name = file; - builder = "/bin/sh"; +let - system = builtins.currentSystem; + fetch = { file, sha256 }: import { + url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/r18744/${file}"; + inherit sha256; + executable = true; + }; - args = [ "-c" "echo $message; exit 1" ]; - - message = '' - Sorry, this version of nix cannot download all of the bootstrap tools. - Please download ${args.url}, make it executable, add it to the store - with `nix-store --add', and try again. - ''; - - outputHashAlgo = "sha256"; - - outputHash = args.sha256; - - outputHashMode = "recursive"; - - preferLocalBuild = true; - }; in { sh = fetch { file = "sh"; diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/ln b/pkgs/stdenv/linux/bootstrap/armv5tel/ln deleted file mode 100755 index f2c0db16401..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/armv5tel/ln and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/mkdir b/pkgs/stdenv/linux/bootstrap/armv5tel/mkdir deleted file mode 100755 index c551673d32a..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/armv5tel/mkdir and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/armv5tel/sh b/pkgs/stdenv/linux/bootstrap/armv5tel/sh deleted file mode 100755 index 74d82aa94f2..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/armv5tel/sh and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/bzip2 b/pkgs/stdenv/linux/bootstrap/i686/bzip2 deleted file mode 100755 index 6cd5273c333..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/i686/bzip2 and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/cpio b/pkgs/stdenv/linux/bootstrap/i686/cpio deleted file mode 100755 index 387b67664f6..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/i686/cpio and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/curl.bz2 b/pkgs/stdenv/linux/bootstrap/i686/curl.bz2 deleted file mode 100755 index a6dd7502b5a..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/i686/curl.bz2 and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686/default.nix index 9c78dcc7b2f..7b6b3ee8034 100644 --- a/pkgs/stdenv/linux/bootstrap/i686/default.nix +++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix @@ -1,36 +1,11 @@ let - fetch = { file, sha256 }: - let - nixFetchurl = import ; - args = { - url = "file://${builtins.toString ./.}/${file}"; - inherit sha256; - executable = true; - }; - in if (builtins.functionArgs nixFetchurl) ? executable - then nixFetchurl args - else derivation { - name = file; - builder = "/bin/sh"; - system = builtins.currentSystem; + fetch = { file, sha256 }: import { + url = "http://tarballs.nixos.org/stdenv-linux/i686/r24519/${file}"; + inherit sha256; + executable = true; + }; - args = [ "-c" "echo $message; exit 1" ]; - - message = '' - Sorry, this version of nix cannot download all of the bootstrap tools. - Please download ${args.url}, make it executable, add it to the store - with `nix-store --add', and try again. - ''; - - outputHashAlgo = "sha256"; - - outputHash = args.sha256; - - outputHashMode = "recursive"; - - preferLocalBuild = true; - }; in { sh = fetch { file = "sh"; @@ -52,11 +27,6 @@ in { sha256 = "046if3aqqramyhrn2yxrjf4bfkl8x1bcqxhvi7ml9nrv9smx8irg"; }; - ln = fetch { - file = "ln"; - sha256 = "06vr474i3x55p0rnqa87yx7dzf4qdfpfg201mks39id43cjm9f8j"; - }; - curl = fetch { file = "curl.bz2"; sha256 = "1v0yfb4gcdyqpl2fxlxjh337r28c23iqm7vwck4p4643xd55di7q"; diff --git a/pkgs/stdenv/linux/bootstrap/i686/ln b/pkgs/stdenv/linux/bootstrap/i686/ln deleted file mode 100755 index 57ddcf8dcf7..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/i686/ln and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/mkdir b/pkgs/stdenv/linux/bootstrap/i686/mkdir deleted file mode 100755 index 18c35db0aff..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/i686/mkdir and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/i686/sh b/pkgs/stdenv/linux/bootstrap/i686/sh deleted file mode 100755 index 13e681ed1a9..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/i686/sh and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/bzip2 b/pkgs/stdenv/linux/bootstrap/loongson2f/bzip2 deleted file mode 100755 index f86964d119c..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/loongson2f/bzip2 and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/cpio b/pkgs/stdenv/linux/bootstrap/loongson2f/cpio deleted file mode 100755 index bf6fd66be23..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/loongson2f/cpio and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/curl.bz2 b/pkgs/stdenv/linux/bootstrap/loongson2f/curl.bz2 deleted file mode 100755 index f227a24bf71..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/loongson2f/curl.bz2 and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix index e49b09eb23c..8e22a274974 100644 --- a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix +++ b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix @@ -1,36 +1,11 @@ let - fetch = { file, sha256 }: - let - nixFetchurl = import ; - args = { - url = "file://${builtins.toString ./.}/${file}"; - inherit sha256; - executable = true; - }; - in if (builtins.functionArgs nixFetchurl) ? executable - then nixFetchurl args - else derivation { - name = file; - builder = "/bin/sh"; - system = builtins.currentSystem; + fetch = { file, sha256 }: import { + url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/${file}"; + inherit sha256; + executable = true; + }; - args = [ "-c" "echo $message; exit 1" ]; - - message = '' - Sorry, this version of nix cannot download all of the bootstrap tools. - Please download ${args.url}, make it executable, add it to the store - with `nix-store --add', and try again. - ''; - - outputHashAlgo = "sha256"; - - outputHash = args.sha256; - - outputHashMode = "recursive"; - - preferLocalBuild = true; - }; in { sh = fetch { file = "sh"; diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/ln b/pkgs/stdenv/linux/bootstrap/loongson2f/ln deleted file mode 100755 index d8afd276424..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/loongson2f/ln and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/mkdir b/pkgs/stdenv/linux/bootstrap/loongson2f/mkdir deleted file mode 100755 index 3a95ccf18d6..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/loongson2f/mkdir and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/loongson2f/sh b/pkgs/stdenv/linux/bootstrap/loongson2f/sh deleted file mode 100755 index f8ef0a74d6b..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/loongson2f/sh and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/bash b/pkgs/stdenv/linux/bootstrap/powerpc/bash deleted file mode 100755 index 7e3e0a5c79b..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/powerpc/bash and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/bzip2 b/pkgs/stdenv/linux/bootstrap/powerpc/bzip2 deleted file mode 100755 index a9eb626e1ca..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/powerpc/bzip2 and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/cp b/pkgs/stdenv/linux/bootstrap/powerpc/cp deleted file mode 100755 index 972a653851c..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/powerpc/cp and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/curl.bz2 b/pkgs/stdenv/linux/bootstrap/powerpc/curl.bz2 deleted file mode 100755 index 4f0d64341e8..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/powerpc/curl.bz2 and /dev/null differ diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix deleted file mode 100644 index 4ad8bc93e44..00000000000 --- a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -let - fetch = { file, sha256 }: - let - nixFetchurl = import ; - args = { - url = "file://${builtins.toString ./.}/${file}"; - inherit sha256; - executable = true; - }; - in if (builtins.functionArgs nixFetchurl) ? executable - then nixFetchurl args - else derivation { - name = file; - builder = "/bin/sh"; - - system = builtins.currentSystem; - - args = [ "-c" "echo $message; exit 1" ]; - - message = '' - Sorry, this version of nix cannot download all of the bootstrap tools. - Please download ${args.url}, make it executable, add it to the store - with `nix-store --add', and try again. - ''; - - outputHashAlgo = "sha256"; - - outputHash = args.sha256; - - outputHashMode = "recursive"; - - preferLocalBuild = true; - }; -in { - bash = fetch { - file = "bash"; - sha256 = "0zss8im6hbx6z2i2wxn1554kd7ggdqdli4xk39cy5fchlnz9bqpp"; - }; - - bzip2 = fetch { - file = "bzip2"; - sha256 = "01ylj8x7albv6k9sqx2h1prsazh4d8y22nga0pwai2bnns0q9qdg"; - }; - - cp = fetch { - file = "cp"; - sha256 = "0d7xbzrv22bxgw7w9b03rakirna5zfvr9gzwm7ichd2fh634hvgl"; - }; - - curl = fetch { - file = "curl.bz2"; - sha256 = "17c25dfslw3qkjlcmihpbhn3x4kj9pgkslizv89ggnki7iiy4jgh"; - }; - - tar = fetch { - file = "tar.bz2"; - sha256 = "132ylqwz02hw5njqx7wvj4sxpcrllx8b8b3a00rlv6iad671ayyr"; - }; - - staticToolsURL = { - url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/static-tools.tar.bz2; - sha1 = "e4d1680e3dfa752e49a996a31140db53b10061cb"; - }; - - binutilsURL = { - url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/binutils.tar.bz2; - sha1 = "2609f4d9277a60fcd178395d3d49911190e08f36"; - }; - - gccURL = { - url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/gcc.tar.bz2; - sha1 = "71d79d736bfef6252208fe6239e528a591becbed"; - }; - - glibcURL = { - url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/glibc.tar.bz2; - sha1 = "bf0245e16235800c8aa9c6a5de6565583a66e46d"; - }; -} diff --git a/pkgs/stdenv/linux/bootstrap/powerpc/tar.bz2 b/pkgs/stdenv/linux/bootstrap/powerpc/tar.bz2 deleted file mode 100755 index c014e9cc044..00000000000 Binary files a/pkgs/stdenv/linux/bootstrap/powerpc/tar.bz2 and /dev/null differ diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 0aa0a9a840b..02635bf1fd5 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -16,7 +16,6 @@ rec { bootstrapFiles = if system == "i686-linux" then import ./bootstrap/i686 else if system == "x86_64-linux" then import ./bootstrap/x86_64 - else if system == "powerpc-linux" then import ./bootstrap/powerpc else if system == "armv5tel-linux" then import ./bootstrap/armv5tel else if system == "armv6l-linux" then import ./bootstrap/armv6l else if system == "armv7l-linux" then import ./bootstrap/armv6l @@ -52,6 +51,7 @@ rec { then [ ./scripts/unpack-bootstrap-tools-arm.sh ] else [ ./scripts/unpack-bootstrap-tools.sh ]; + # FIXME: get rid of curl. inherit (bootstrapFiles) bzip2 mkdir curl cpio; tarball = import {