diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-27 23:14:41 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-27 23:14:41 +0000 |
| commit | 3a6754f6bbd3baf75d0bd3ded15b76a822a470ee (patch) | |
| tree | fafaf97ad0ac7382322b5204443a4c5ea6b71a57 /pkgs | |
| parent | b7a96d74e2477b771d02c8fbfe00dd6d8e78f78c (diff) | |
| download | nixlib-3a6754f6bbd3baf75d0bd3ded15b76a822a470ee.tar nixlib-3a6754f6bbd3baf75d0bd3ded15b76a822a470ee.tar.gz nixlib-3a6754f6bbd3baf75d0bd3ded15b76a822a470ee.tar.bz2 nixlib-3a6754f6bbd3baf75d0bd3ded15b76a822a470ee.tar.lz nixlib-3a6754f6bbd3baf75d0bd3ded15b76a822a470ee.tar.xz nixlib-3a6754f6bbd3baf75d0bd3ded15b76a822a470ee.tar.zst nixlib-3a6754f6bbd3baf75d0bd3ded15b76a822a470ee.zip | |
* gcc-4.1-temp -> gcc-4.1.
* Use real URLs. svn path=/nixpkgs/trunk/; revision=6884
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/gcc-4.1/builder.sh (renamed from pkgs/development/compilers/gcc-4.1-temp/builder.sh) | 0 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc-4.1/default.nix (renamed from pkgs/development/compilers/gcc-4.1-temp/default.nix) | 0 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch (renamed from pkgs/development/compilers/gcc-4.1-temp/no-sys-dirs.patch) | 0 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc-4.1/pass-cxxcpp.patch (renamed from pkgs/development/compilers/gcc-4.1-temp/pass-cxxcpp.patch) | 0 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/bootstrap/i686/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
6 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/gcc-4.1-temp/builder.sh b/pkgs/development/compilers/gcc-4.1/builder.sh index 7aaca0c5d6b0..7aaca0c5d6b0 100644 --- a/pkgs/development/compilers/gcc-4.1-temp/builder.sh +++ b/pkgs/development/compilers/gcc-4.1/builder.sh diff --git a/pkgs/development/compilers/gcc-4.1-temp/default.nix b/pkgs/development/compilers/gcc-4.1/default.nix index ba4756eb82a7..ba4756eb82a7 100644 --- a/pkgs/development/compilers/gcc-4.1-temp/default.nix +++ b/pkgs/development/compilers/gcc-4.1/default.nix diff --git a/pkgs/development/compilers/gcc-4.1-temp/no-sys-dirs.patch b/pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch index b7b93d6944cc..b7b93d6944cc 100644 --- a/pkgs/development/compilers/gcc-4.1-temp/no-sys-dirs.patch +++ b/pkgs/development/compilers/gcc-4.1/no-sys-dirs.patch diff --git a/pkgs/development/compilers/gcc-4.1-temp/pass-cxxcpp.patch b/pkgs/development/compilers/gcc-4.1/pass-cxxcpp.patch index 9b0676d4fdc9..9b0676d4fdc9 100644 --- a/pkgs/development/compilers/gcc-4.1-temp/pass-cxxcpp.patch +++ b/pkgs/development/compilers/gcc-4.1/pass-cxxcpp.patch diff --git a/pkgs/stdenv/linux/bootstrap/i686/default.nix b/pkgs/stdenv/linux/bootstrap/i686/default.nix index 37bc758b9313..d48cbc9a5c51 100644 --- a/pkgs/stdenv/linux/bootstrap/i686/default.nix +++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix @@ -6,22 +6,22 @@ tar = ./tar.bz2; staticToolsURL = { - url = file:///tmp/tarballs/static-tools.tar.bz2; + url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/static-tools.tar.bz2; sha1 = "c366d9ee0d969e68311fdb37abc91b46fb13b585"; }; binutilsURL = { - url = file:///tmp/tarballs/binutils.tar.bz2; + url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/binutils.tar.bz2; sha1 = "fa77c29ef4f13ddf43bba3f4f020ceafa6604ccc"; }; gccURL = { - url = file:///tmp/tarballs/gcc.tar.bz2; + url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/gcc.tar.bz2; sha1 = "ea7171fc2f70880e8a6c2480b3d3fed7409b7a4e"; }; glibcURL = { - url = file:///tmp/tarballs/glibc.tar.bz2; + url = http://nix.cs.uu.nl/dist/tarballs/stdenv-linux/i686/r6881/glibc.tar.bz2; sha1 = "728e0a9e66e01cf2815eca8cc638e5ed140a36cd"; }; } diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 08b6f61ad383..db7c3d72e114 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -48,7 +48,7 @@ let then pkgsDiet.gawk else pkgsStatic.gawk; - gcc = import ../../development/compilers/gcc-4.1-temp { + gcc = import ../../development/compilers/gcc-4.1 { inherit (pkgs) fetchurl stdenv; noSysDirs = true; langCC = false; |