Commit Graph

126 Commits

Author SHA1 Message Date
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Andres Löh
b66db5ca13 Add ghc-7.4.1. Remove Hydra building for the 7.2.* series.
svn path=/nixpkgs/trunk/; revision=31989
2012-02-02 21:08:30 +00:00
Andres Löh
a819ccf030 Updated GHC snapshot to ghc-7.4.1-rc2.
svn path=/nixpkgs/trunk/; revision=31910
2012-01-28 15:34:53 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Andres Löh
8af094c99f Updated ghc HEAD snapshot to ghc-7.4.1-rc1.
svn path=/nixpkgs/trunk/; revision=31066
2011-12-25 00:12:52 +00:00
Andres Löh
c11749dcd6 Updated the GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=30937
2011-12-16 18:11:23 +00:00
Andres Löh
64c0b00bbd Linking the complete topdir of GHC in ghc-with-packages.
svn path=/nixpkgs/trunk/; revision=30826
2011-12-11 17:19:36 +00:00
Andres Löh
de5d98eff8 Prevent link collisions by linking only Haskell packages.
svn path=/nixpkgs/trunk/; revision=30727
2011-12-04 17:45:12 +00:00
Andres Löh
f237a3a418 Extended ghcWithPackages to link binaries.
svn path=/nixpkgs/trunk/; revision=30726
2011-12-04 16:07:39 +00:00
Andres Löh
ecf037f2f7 Added a wrapper function to produce a GHC with a predefined set of packages.
svn path=/nixpkgs/trunk/; revision=30716
2011-12-03 16:19:43 +00:00
Peter Simons
66bd9580f0 Added GHC 7.2.2.
svn path=/nixpkgs/trunk/; revision=30398
2011-11-12 22:19:03 +00:00
Andres Löh
829a5e3209 Bump GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=29164
2011-09-11 09:14:22 +00:00
Andres Löh
51124b08b5 Bumping the GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=29026
2011-09-05 13:29:33 +00:00
Peter Simons
feff68214e pkgs/development/compilers/ghc/7.0.4.nix: hard-code list of supported platforms
I assumed that Hydra would arrive at that result anyway, but apparently
it doesn't: no x86_64-darwin builds have occurred despite the fact that
we can bootstrap on that architecture now.

svn path=/nixpkgs/trunk/; revision=28882
2011-08-29 20:09:57 +00:00
Shea Levy
3fe371b856 ghc/7.0.4-binary.nix: Remove comments about wrapper scripts
svn path=/nixpkgs/trunk/; revision=28869
2011-08-29 08:09:27 +00:00
Shea Levy
9381f1a419 ghc-7.0.4-binary.nix: don't wrap the binaries on darwin
ghc-7.0.4 fails at configure with the wrapped binaries and builds fine with the unwrapped binaries.

svn path=/nixpkgs/trunk/; revision=28868
2011-08-29 08:00:55 +00:00
Peter Simons
f990dd30f7 pkgs/development/compilers/ghc/7.0.4-binary.nix: added (untested) support for i686-darwin
svn path=/nixpkgs/trunk/; revision=28866
2011-08-29 07:49:35 +00:00
Peter Simons
8286d30453 pkgs/development/compilers/ghc/7.0.4.nix: add myself as a maintainer
svn path=/nixpkgs/trunk/; revision=28863
2011-08-29 07:39:29 +00:00
Peter Simons
33597eee35 pkgs/development/compilers/ghc/7.0.4-binary.nix: pass "$@" in double quotes to avoid issues with arguments that contain whitespace
svn path=/nixpkgs/trunk/; revision=28861
2011-08-29 07:32:37 +00:00
Peter Simons
e9c8a9307b pkgs/development/compilers/ghc/7.0.4-binary.nix: support linux, too
svn path=/nixpkgs/trunk/; revision=28860
2011-08-29 07:25:56 +00:00
Shea Levy
346481f483 Add GHC 7.0.4 binary for x86_64-darwin
svn path=/nixpkgs/trunk/; revision=28859
2011-08-29 01:20:12 +00:00
Peter Simons
c6f12a23e6 pkgs/development/compilers/ghc/wrapper.nix: stripped trailing whitespace
svn path=/nixpkgs/trunk/; revision=28609
2011-08-16 13:03:38 +00:00
Peter Simons
611501c349 pkgs/development/compilers/ghc/7.2.1.nix: updated to the final release version
svn path=/nixpkgs/trunk/; revision=28463
2011-08-10 16:55:54 +00:00
Peter Simons
9502aedde3 pkgs/development/compilers/ghc/6.10.2-binary.nix: we have no binary for Darwin
svn path=/nixpkgs/trunk/; revision=28414
2011-08-09 08:17:39 +00:00
Peter Simons
d3df8772c1 pkgs/development/compilers/ghc: changed all GHC versions to use re-use the meta.platforms attribute of their bootstrap compiler
svn path=/nixpkgs/trunk/; revision=28409
2011-08-09 07:42:05 +00:00
Peter Simons
0be3dae42f pkgs/development/compilers/ghc/*-binary.nix: added a meta.platforms attribute to all ghc bootstrap versions
svn path=/nixpkgs/trunk/; revision=28408
2011-08-09 07:41:10 +00:00
Peter Simons
98b321e99b pkgs/development/compilers/ghc: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=28402
2011-08-08 19:47:31 +00:00
Peter Simons
e2cfe51f21 pkgs/development/compilers/ghc: move the homepage attribute into the meta section
svn path=/nixpkgs/trunk/; revision=28401
2011-08-08 19:47:21 +00:00
Andres Löh
1e5a711f96 Updating ghc-7.2.1 to rc2.
svn path=/nixpkgs/trunk/; revision=28185
2011-08-05 22:11:30 +00:00
Andres Löh
25e212ac0e Bumping the GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=28166
2011-08-05 13:30:42 +00:00
Andres Löh
7f71e44d8e Fix sha256 sums for ghc-6.12.1 binaries.
svn path=/nixpkgs/trunk/; revision=28165
2011-08-05 11:03:16 +00:00
Andres Löh
8fdb3c9e63 Make ghc-7.0.4 the default. Add experimental ghc-7.2.1rc1.
svn path=/nixpkgs/trunk/; revision=28163
2011-08-05 08:52:35 +00:00
Peter Simons
66dbd40cb7 ghc: build GHC on haskellPlatforms instead of linux++darwin to avoid evaluation errors on Hydra because x86_64-darwin is unsupported
svn path=/nixpkgs/trunk/; revision=27799
2011-07-15 12:53:21 +00:00
Peter Simons
78ccc14e3e ghc-6.10.1-binary: revert blind attempt to bootstrap GHC on x86_64-darwin with the i686 version of this compiler
Hydra says that we can *not* use the i686 compiler to bootstrap x86_64 on Darwin. Duh.

svn path=/nixpkgs/trunk/; revision=27753
2011-07-13 12:00:19 +00:00
Peter Simons
ce11df9d80 ghc-6.10.1-binary: blind attempt to bootstrap GHC on x86_64-darwin with the i686 version of this compiler
I have no idea whether that's going to work, and I can't test it for
lack of access to a MacOS X machine, but think chances are pretty good
that this is going to succeed.

svn path=/nixpkgs/trunk/; revision=27751
2011-07-13 11:09:06 +00:00
Andres Löh
a1cd10cfe2 Adding ghc-7.0.4.
svn path=/nixpkgs/trunk/; revision=27492
2011-06-18 12:31:16 +00:00
Andres Löh
f9c356ad17 Adding ghc-7.0.3.
svn path=/nixpkgs/trunk/; revision=26588
2011-03-28 21:33:21 +00:00
Peter Simons
cec39fe1a8 ghc-7.0.2: moved 'homepage' setting into the meta section
svn path=/nixpkgs/trunk/; revision=26514
2011-03-25 12:55:42 +00:00
Peter Simons
b579f4fd5c ghc-7.0.2: fix build on Darwin
There were two problems preventing GHC 7.0.2 from being built on MacOS. For
one, the 'configure' script automatically added the flag

  -isysroot /Developer/SDKs/MacOSX10.5.sdk

to the command-line that's being passed to GCC. This setting doesn't work with
our GCC, and resulted in build errors because standard headers like <stdargs.h>
could no longer be found.

Secondly, the build depends on install_name_tool, which has been added as a
buildInput.

These changes trigger a re-build on all platforms, not just on Darwin. I
realize that this could have been avoided by adding some cruft. However, I
didn't want to add cruft, so there you are.

svn path=/nixpkgs/trunk/; revision=26513
2011-03-25 12:55:37 +00:00
Andres Löh
92db39f586 Added ghc-7.0.2.
This is supposed to become the new default version of GHC once
the new Haskell Platform is released (but only then).

svn path=/nixpkgs/trunk/; revision=26217
2011-03-09 08:29:12 +00:00
Andres Löh
b13e4ebdef Updated ghc HEAD expression to 7.0.2-rc2.
svn path=/nixpkgs/trunk/; revision=26127
2011-03-01 11:56:41 +00:00
Andres Löh
d233819021 Bumped ghc-7.0.1 from rc2 to released version.
svn path=/nixpkgs/trunk/; revision=24770
2010-11-19 13:05:39 +00:00
Andres Löh
6c5c9fc17c Updated GHC 7.0.1 release candidate.
svn path=/nixpkgs/trunk/; revision=24583
2010-11-03 13:52:20 +00:00
Andres Löh
f6e3110b74 Preliminarily added ghc-7.0.1-rc1 and current HEAD.
svn path=/nixpkgs/trunk/; revision=23985
2010-09-28 13:48:22 +00:00
Andres Löh
eb2cb9afd4 Added ghc-6.12.3. Does not build yet for me -- still have to figure out why.
svn path=/nixpkgs/trunk/; revision=22525
2010-07-08 11:43:06 +00:00
Andres Löh
7d2ae46bce Add missing binaries to the GHC wrapper.
svn path=/nixpkgs/trunk/; revision=21434
2010-04-29 17:35:05 +00:00
Andres Löh
8bf3f76256 Let GHC wrapper inherit meta from the wrapped expression.
svn path=/nixpkgs/trunk/; revision=21330
2010-04-26 20:39:51 +00:00
Andres Löh
b48dfda990 Added ghc-6.12.2.
svn path=/nixpkgs/trunk/; revision=21303
2010-04-25 17:27:21 +00:00
Andres Löh
776d8267c6 Added a couple of comments to ghc expression and myself as maintainer,
in preparation for adding ghc-6.12.2 ...

svn path=/nixpkgs/trunk/; revision=21268
2010-04-23 12:38:34 +00:00
Rob Vermaas
9308f0465f set meta.platforms to get rid of hydra evaluation errors (assertions)
svn path=/nixpkgs/trunk/; revision=20300
2010-03-01 12:21:12 +00:00