Author: viric
Date: Sat Jan 21 00:34:51 2012
New Revision: 31751
URL: https://nixos.org/websvn/nix/?rev=31751&sc=1
Log:
Changing every reference from mips64-linux to mips64el-linux. That's
what the new nix thinks the fuloong is.
Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.
Modified:
nixpkgs/trunk/pkgs/build-support/clang-wrapper/default.nix
nixpkgs/trunk/pkgs/build-support/gcc-wrapper/default.nix
nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix
nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix
nixpkgs/trunk/pkgs/development/libraries/libxcrypt/default.nix
nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix
nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix
nixpkgs/trunk/pkgs/lib/platforms.nix
nixpkgs/trunk/pkgs/os-specific/linux/kbd/default.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix
nixpkgs/trunk/pkgs/os-specific/linux/pam/default.nix
nixpkgs/trunk/pkgs/stdenv/default.nix
nixpkgs/trunk/pkgs/stdenv/generic/default.nix
nixpkgs/trunk/pkgs/stdenv/linux/default.nix
Modified: nixpkgs/trunk/pkgs/build-support/clang-wrapper/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/clang-wrapper/default.nix Sat Jan 21
00:34:38 2012 (r31750)
+++ nixpkgs/trunk/pkgs/build-support/clang-wrapper/default.nix Sat Jan 21
00:34:51 2012 (r31751)
@@ -78,7 +78,7 @@
if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else
if stdenv.system == "powerpc-linux" then "ld.so.1" else
- if stdenv.system == "mips64-linux" then "ld.so.1" else
+ if stdenv.system == "mips64el-linux" then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform")
else "";
}
Modified: nixpkgs/trunk/pkgs/build-support/gcc-wrapper/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/gcc-wrapper/default.nix Sat Jan 21
00:34:38 2012 (r31750)
+++ nixpkgs/trunk/pkgs/build-support/gcc-wrapper/default.nix Sat Jan 21
00:34:51 2012 (r31751)
@@ -86,7 +86,7 @@
if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else
if stdenv.system == "powerpc-linux" then "ld.so.1" else
- if stdenv.system == "mips64-linux" then "ld.so.1" else
+ if stdenv.system == "mips64el-linux" then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform")
else "";
}
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix Sat Jan
21 00:34:38 2012 (r31750)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.5/default.nix Sat Jan
21 00:34:51 2012 (r31751)
@@ -260,8 +260,8 @@
)
)
}
- ${ # Trick that should be taken out once we have a mips64-linux not
loongson2f
- if cross == null && stdenv.system == "mips64-linux" then
"--with-arch=loongson2f" else ""}
+ ${ # Trick that should be taken out once we have a mips64el-linux not
loongson2f
+ if cross == null && stdenv.system == "mips64el-linux" then
"--with-arch=loongson2f" else ""}
${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Sat Jan
21 00:34:38 2012 (r31750)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-4.6/default.nix Sat Jan
21 00:34:51 2012 (r31751)
@@ -270,8 +270,8 @@
)
)
}
- ${ # Trick that should be taken out once we have a mips64-linux not
loongson2f
- if cross == null && stdenv.system == "mips64-linux" then
"--with-arch=loongson2f" else ""}
+ ${ # Trick that should be taken out once we have a mips64el-linux not
loongson2f
+ if cross == null && stdenv.system == "mips64el-linux" then
"--with-arch=loongson2f" else ""}
${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}
Modified: nixpkgs/trunk/pkgs/development/libraries/libxcrypt/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/libxcrypt/default.nix Sat Jan
21 00:34:38 2012 (r31750)
+++ nixpkgs/trunk/pkgs/development/libraries/libxcrypt/default.nix Sat Jan
21 00:34:51 2012 (r31751)
@@ -2,7 +2,7 @@
# I could not build it in armv5tel-linux or the fuloon2f
assert stdenv.system != "armv5tel-linux";
-assert stdenv.system != "mips64-linux";
+assert stdenv.system != "mips64el-linux";
stdenv.mkDerivation {
name = "libxcrypt-3.0.2";
Modified: nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Sat Jan 21
00:34:38 2012 (r31750)
+++ nixpkgs/trunk/pkgs/development/libraries/mesa/default.nix Sat Jan 21
00:34:51 2012 (r31751)
@@ -18,7 +18,7 @@
};
patches = [ ./swrast-settexbuffer.patch ] ++ stdenv.lib.optional
- (stdenv.system == "mips64-linux") ./mips_wmb.patch;
+ (stdenv.system == "mips64el-linux") ./mips_wmb.patch;
prePatch = "patchShebangs .";
Modified: nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix Sat Jan
21 00:34:38 2012 (r31750)
+++ nixpkgs/trunk/pkgs/development/tools/misc/binutils/default.nix Sat Jan
21 00:34:51 2012 (r31751)
@@ -54,7 +54,7 @@
'';
configureFlags = "--disable-werror" # needed for dietlibc build
- + stdenv.lib.optionalString (stdenv.system == "mips64-linux")
+ + stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
" --enable-fix-loongson2f-nop"
+ stdenv.lib.optionalString (cross != null) " --target=${cross.config}"
+ stdenv.lib.optionalString gold " --enable-gold";
Modified: nixpkgs/trunk/pkgs/lib/platforms.nix
==============================================================================
--- nixpkgs/trunk/pkgs/lib/platforms.nix Sat Jan 21 00:34:38 2012
(r31750)
+++ nixpkgs/trunk/pkgs/lib/platforms.nix Sat Jan 21 00:34:51 2012
(r31751)
@@ -3,7 +3,7 @@
rec {
gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */
linux = ["i686-linux" "x86_64-linux" "powerpc-linux" "armv5tel-linux"
- "mips64-linux"];
+ "mips64el-linux"];
darwin = ["i686-darwin" "powerpc-darwin" "x86_64-darwin"];
freebsd = ["i686-freebsd" "x86_64-freebsd" "powerpc-freebsd"];
openbsd = ["i686-openbsd" "x86_64-openbsd"];
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kbd/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kbd/default.nix Sat Jan 21
00:34:38 2012 (r31750)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kbd/default.nix Sat Jan 21
00:34:51 2012 (r31751)
@@ -13,7 +13,7 @@
# We get a warning in armv5tel-linux and the fuloong2f,
# so we disable -Werror in it
patchPhase = if (stdenv.system == "armv5tel-linux" ||
- stdenv.system == "mips64-linux")
+ stdenv.system == "mips64el-linux")
then ''
sed -i s/-Werror// src/Makefile.am
'' else "";
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.28.nix Sat Jan
21 00:34:38 2012 (r31750)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.28.nix Sat Jan
21 00:34:51 2012 (r31751)
@@ -20,7 +20,7 @@
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else
if stdenv.system == "armv5tel-linux" then "arm" else
- if stdenv.system == "mips64-linux" then "mips" else
+ if stdenv.system == "mips64el-linux" then "mips" else
abort "don't know what the kernel include directory is called for this
platform";
buildInputs = [perl];
Modified: nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix Sat Jan 21
00:34:38 2012 (r31750)
+++ nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix Sat Jan 21
00:34:51 2012 (r31751)
@@ -46,7 +46,7 @@
}:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"
- || stdenv.system == "armv5tel-linux" || stdenv.system == "mips64-linux";
+ || stdenv.system == "armv5tel-linux" || stdenv.system == "mips64el-linux";
assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null;
@@ -102,7 +102,7 @@
if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "armv5tel-linux" then "arm" else
- if stdenv.system == "mips64-linux" then "mips" else
+ if stdenv.system == "mips64el-linux" then "mips" else
abort "Platform ${stdenv.system} is not supported.";
crossAttrs = let
Modified: nixpkgs/trunk/pkgs/os-specific/linux/pam/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/os-specific/linux/pam/default.nix Sat Jan 21
00:34:38 2012 (r31750)
+++ nixpkgs/trunk/pkgs/os-specific/linux/pam/default.nix Sat Jan 21
00:34:51 2012 (r31751)
@@ -11,7 +11,7 @@
buildNativeInputs = [ flex ];
buildInputs = [ cracklib ]
++ stdenv.lib.optional
- (stdenv.system != "armv5tel-linux" && stdenv.system != "mips64-linux")
+ (stdenv.system != "armv5tel-linux" && stdenv.system != "mips64el-linux")
libxcrypt;
crossAttrs = {
Modified: nixpkgs/trunk/pkgs/stdenv/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/stdenv/default.nix Sat Jan 21 00:34:38 2012
(r31750)
+++ nixpkgs/trunk/pkgs/stdenv/default.nix Sat Jan 21 00:34:51 2012
(r31751)
@@ -55,7 +55,7 @@
if stdenvType == "i686-linux" then stdenvLinux else
if stdenvType == "x86_64-linux" then stdenvLinux else
if stdenvType == "armv5tel-linux" then stdenvLinux else
- if stdenvType == "mips64-linux" then stdenvLinux else
+ if stdenvType == "mips64el-linux" then stdenvLinux else
if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else
if stdenvType == "i686-mingw" then stdenvMinGW else
if stdenvType == "i686-darwin" then stdenvNix else
Modified: nixpkgs/trunk/pkgs/stdenv/generic/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/stdenv/generic/default.nix Sat Jan 21 00:34:38
2012 (r31750)
+++ nixpkgs/trunk/pkgs/stdenv/generic/default.nix Sat Jan 21 00:34:51
2012 (r31751)
@@ -97,7 +97,7 @@
|| result.system == "x86_64-linux"
|| result.system == "powerpc-linux"
|| result.system == "armv5tel-linux"
- || result.system == "mips64-linux";
+ || result.system == "mips64el-linux";
isSunOS = result.system == "i686-solaris"
|| result.system == "x86_64-solaris";
isCygwin = result.system == "i686-cygwin";
@@ -121,7 +121,7 @@
is64bit = result.system == "x86_64-linux"
|| result.system == "x86_64-darwin";
isMips = result.system == "mips-linux"
- || result.system == "mips64-linux";
+ || result.system == "mips64el-linux";
isArm = result.system == "armv5tel-linux";
# Utility function: allow stdenv to be easily regenerated with
Modified: nixpkgs/trunk/pkgs/stdenv/linux/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/stdenv/linux/default.nix Sat Jan 21 00:34:38 2012
(r31750)
+++ nixpkgs/trunk/pkgs/stdenv/linux/default.nix Sat Jan 21 00:34:51 2012
(r31751)
@@ -14,7 +14,7 @@
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 == "mips64-linux" then import ./bootstrap/loongson2f
+ else if system == "mips64el-linux" then import ./bootstrap/loongson2f
else abort "unsupported platform for the pure Linux stdenv";
@@ -23,7 +23,7 @@
export NIX_ENFORCE_PURITY=1
havePatchELF=1
${if system == "x86_64-linux" then "NIX_LIB64_IN_SELF_RPATH=1" else ""}
- ${if system == "mips64-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
+ ${if system == "mips64el-linux" then "NIX_LIB32_IN_SELF_RPATH=1" else ""}
'';
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
