Author: eelco
Date: Mon Nov 21 14:11:04 2011
New Revision: 30507
URL: https://nixos.org/websvn/nix/?rev=30507&sc=1
Log:
* i386-sunos -> i686-solaris.
Modified:
nixpkgs/trunk/pkgs/development/libraries/ncurses/default.nix
nixpkgs/trunk/pkgs/development/tools/misc/autoconf/default.nix
nixpkgs/trunk/pkgs/stdenv/generic/default.nix
nixpkgs/trunk/pkgs/stdenv/native/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/ncurses/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/ncurses/default.nix Mon Nov
21 14:05:26 2011 (r30506)
+++ nixpkgs/trunk/pkgs/development/libraries/ncurses/default.nix Mon Nov
21 14:11:04 2011 (r30507)
@@ -8,7 +8,7 @@
<http://mail.python.org/pipermail/python-bugs-list/2006-September/035362.html>,
but this is left as an exercise to the reader.
So disable them for now. */
- cxx = stdenv.system != "i386-sunos";
+ cxx = stdenv.system != "i686-solaris";
in
stdenv.mkDerivation (rec {
name = "ncurses-5.7";
Modified: nixpkgs/trunk/pkgs/development/tools/misc/autoconf/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/misc/autoconf/default.nix Mon Nov
21 14:05:26 2011 (r30506)
+++ nixpkgs/trunk/pkgs/development/tools/misc/autoconf/default.nix Mon Nov
21 14:11:04 2011 (r30507)
@@ -15,7 +15,7 @@
# details.
# There are many test failures on `i386-pc-solaris2.11'.
doCheck = (stdenv.system != "i686-cygwin"
- && stdenv.system != "i386-sunos");
+ && stdenv.system != "i686-solaris");
# Don't fixup "#! /bin/sh" in Autoconf, otherwise it will use the
# "fixed" path in generated files!
Modified: nixpkgs/trunk/pkgs/stdenv/generic/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/stdenv/generic/default.nix Mon Nov 21 14:05:26
2011 (r30506)
+++ nixpkgs/trunk/pkgs/stdenv/generic/default.nix Mon Nov 21 14:11:04
2011 (r30507)
@@ -98,7 +98,8 @@
|| result.system == "powerpc-linux"
|| result.system == "armv5tel-linux"
|| result.system == "mips64-linux";
- isSunOS = result.system == "i386-sunos";
+ isSunOS = result.system == "i686-solaris"
+ || result.system == "x86_64-solaris";
isCygwin = result.system == "i686-cygwin";
isFreeBSD = result.system == "i686-freebsd"
|| result.system == "x86_64-freebsd";
Modified: nixpkgs/trunk/pkgs/stdenv/native/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/stdenv/native/default.nix Mon Nov 21 14:05:26
2011 (r30506)
+++ nixpkgs/trunk/pkgs/stdenv/native/default.nix Mon Nov 21 14:11:04
2011 (r30507)
@@ -3,12 +3,12 @@
rec {
shell =
- if system == "i686-freebsd" || system == "x86_64-freebsd"
- then "/usr/local/bin/bash"
+ if system == "i686-freebsd" || system == "x86_64-freebsd" then
"/usr/local/bin/bash"
+ else if system == "i686-solaris" then "/usr/bin/bash"
else "/bin/bash";
path =
- (if system == "i386-sunos" then [ "/usr/gnu" ] else []) ++
+ (if system == "i686-solaris" then [ "/usr/gnu" ] else []) ++
(if system == "i686-netbsd" then [ "/usr/pkg" ] else []) ++
["/" "/usr" "/usr/local"];
@@ -115,7 +115,7 @@
name = "gcc-native";
nativeTools = true;
nativeLibc = true;
- nativePrefix = if system == "i386-sunos" then "/usr/gnu" else "/usr";
+ nativePrefix = if system == "i686-solaris" then "/usr/gnu" else "/usr";
stdenv = stdenvBoot0;
};
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Nov 21 14:05:26
2011 (r30506)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Mon Nov 21 14:11:04
2011 (r30507)
@@ -2787,7 +2787,7 @@
automake111x = callPackage
../development/tools/misc/automake/automake-1.11.x.nix {
doCheck = !stdenv.isArm && !stdenv.isCygwin
# Some of the parallel tests seem to hang on `i386-pc-solaris2.11'.
- && stdenv.system != "i386-sunos";
+ && stdenv.system != "i686-solaris";
};
automoc4 = callPackage ../development/tools/misc/automoc4 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
