Author: ludo
Date: Tue Aug 30 13:08:33 2011
New Revision: 28926
URL: https://svn.nixos.org/websvn/nix/?rev=28926&sc=1
Log:
Merge from the `darwin-updates' branch.
Modified:
nixpkgs/trunk/ (props changed)
nixpkgs/trunk/pkgs/applications/graphics/xscreensaver/default.nix (props
changed)
nixpkgs/trunk/pkgs/applications/misc/xneur/0.8.nix (props changed)
nixpkgs/trunk/pkgs/applications/networking/browsers/icecat-4/ (props
changed)
nixpkgs/trunk/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/trunk/pkgs/build-support/gcc-wrapper/ (props changed)
nixpkgs/trunk/pkgs/build-support/release/debian-build.nix (props changed)
nixpkgs/trunk/pkgs/build-support/release/nix-build.nix (props changed)
nixpkgs/trunk/pkgs/build-support/release/rpm-build.nix (props changed)
nixpkgs/trunk/pkgs/build-support/release/source-tarball.nix (props changed)
nixpkgs/trunk/pkgs/desktops/kde-4.5/support/shared-desktop-ontologies/
(props changed)
nixpkgs/trunk/pkgs/development/compilers/gcc-apple64/default.nix
nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.1.nix (props changed)
nixpkgs/trunk/pkgs/development/compilers/ghc/6.10.2.nix (props changed)
nixpkgs/trunk/pkgs/development/compilers/ghc/6.8.2.nix (props changed)
nixpkgs/trunk/pkgs/development/compilers/ghc/6.8.3.nix (props changed)
nixpkgs/trunk/pkgs/development/libraries/aterm/2.8.nix (props changed)
nixpkgs/trunk/pkgs/development/libraries/fltk/fltk11.nix (props changed)
nixpkgs/trunk/pkgs/development/libraries/glibc-2.9/ (props changed)
nixpkgs/trunk/pkgs/development/libraries/goocanvas/ (props changed)
nixpkgs/trunk/pkgs/development/libraries/pcre/default.nix (props changed)
nixpkgs/trunk/pkgs/development/libraries/readline/readline6.nix (props
changed)
nixpkgs/trunk/pkgs/development/tools/misc/autoconf/2.13.nix (props changed)
nixpkgs/trunk/pkgs/development/tools/misc/gnum4/default.nix (props changed)
nixpkgs/trunk/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/trunk/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/atheros/r3867.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.28.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel-headers/2.6.32.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/generic.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.25.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.27.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.28.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.29.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.32.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kernel/linux-2.6.33.nix (props
changed)
nixpkgs/trunk/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/qemu-kvm/default.nix (props changed)
nixpkgs/trunk/pkgs/os-specific/linux/util-linux-ng/ (props changed)
nixpkgs/trunk/pkgs/servers/mail/dovecot/1.1.1.nix (props changed)
nixpkgs/trunk/pkgs/shells/bash/default.nix (props changed)
nixpkgs/trunk/pkgs/stdenv/generic/setup.sh (props changed)
nixpkgs/trunk/pkgs/stdenv/linux/make-bootstrap-tools.nix (props changed)
nixpkgs/trunk/pkgs/tools/networking/wget/default.nix (props changed)
Modified: nixpkgs/trunk/pkgs/development/compilers/gcc-apple64/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/gcc-apple64/default.nix Tue Aug
30 09:49:12 2011 (r28925)
+++ nixpkgs/trunk/pkgs/development/compilers/gcc-apple64/default.nix Tue Aug
30 13:08:33 2011 (r28926)
@@ -8,23 +8,29 @@
assert stdenv.isDarwin;
assert langF77 -> gmp != null;
+let
+ version = "4.2.1"; # Upstream GCC version, from `gcc/BASE-VER'.
+ revision = "5666.3"; # Apple's fork revision number.
+in
stdenv.mkDerivation ({
- name = "gcc-4.2.1-apple-5646";
+ name = "gcc-apple-${version}.${revision}";
+
builder = ./builder.sh;
- src =
+
+ src =
stdenv.lib.optional /*langC*/ true (fetchurl {
- url = http://www.opensource.apple.com/tarballs/gcc/gcc-5646.tar.gz;
- sha256 = "13jghyb098104kfym96iwwdvbj6snnws2c92h48lbd4fmyf1iv24";
+ url =
"http://www.opensource.apple.com/tarballs/gcc/gcc-${revision}.tar.gz";;
+ sha256 = "0nq1szgqx9ryh1qsn5n6yd55gpvf56wr8f7w1jzabb8idlvz8ikc";
}) ++
stdenv.lib.optional langCC (fetchurl {
url =
http://www.opensource.apple.com/tarballs/libstdcxx/libstdcxx-39.tar.gz ;
- sha256 = "1fy6j41rhxdsm19sib9wygjl5l54g8pm13c6y5x13f40mavw1mma";
+ sha256 =
"ccf4cf432c142778c766affbbf66b61001b6c4f1107bc2b2c77ce45598786b6d";
}) ;
enableParallelBuilding = true;
libstdcxx = "libstdcxx-39";
- sourceRoot = "gcc-5646/";
+ sourceRoot = "gcc-${revision}/";
patches =
[./pass-cxxcpp.patch ]
++ (if noSysDirs then [./no-sys-dirs.patch] else []);
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
