Commit graph

985 commits

Author SHA1 Message Date
Shea Levy 4d70ba6cc9 Merge from trunk up through r28790
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
2011-08-24 19:16:43 +00:00
Peter Simons 058055fd16 haskell-packages: normalize all lists to state their elements in alphabetical order
svn path=/nixpkgs/trunk/; revision=28774
2011-08-23 11:00:05 +00:00
Peter Simons c8ae7cc8bb Updated build expressions for the current version of cabal.nix.
svn path=/nixpkgs/trunk/; revision=28772
2011-08-23 10:35:49 +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 d86fb89aa6 haskell-idris: updated to version 0.1.7.1
svn path=/nixpkgs/trunk/; revision=28555
2011-08-13 23:38:48 +00:00
Peter Simons 0891479ca6 haskell-epic: updated to version 0.1.11
svn path=/nixpkgs/trunk/; revision=28513
2011-08-12 11:02:48 +00:00
Shea Levy 5040530375 openjdk: Only builds on linux for now
svn path=/nixpkgs/trunk/; revision=28495
2011-08-11 14:48:06 +00:00
Shea Levy b6d81d67d8 openjdk: Comment out the multiple outputs stuff for now
svn path=/nixpkgs/trunk/; revision=28494
2011-08-11 13:35:20 +00:00
Shea Levy bff57396f5 openjdk: Add a fix for versions of nix not yet supporting multiple outputs
svn path=/nixpkgs/trunk/; revision=28493
2011-08-11 13:27:43 +00:00
Shea Levy e5a6f2702b openjdk: Add the 'jre' output.
Note that this is almost completely useless for now, when openjdk is built a separate store path containing only the jre will be built but it will not be added to the environment nor as a gc root. If you want to install just the jre, for now build openjre (which uses the jreOnly parameter). Once multiple outputs are more feature-complete, this should hopefully be useful and remove the need for the jreOnly parameter

svn path=/nixpkgs/trunk/; revision=28481
2011-08-11 02:29:10 +00:00
Shea Levy fbb50e0f6d openjdk: Use the proper format for BUILD_NUMBER
svn path=/nixpkgs/trunk/; revision=28480
2011-08-11 01:13:12 +00:00
Shea Levy 93548e648e openjdk: Add a patch to fix a stupid linux version check
Hopefully by the time the Linux 4.x series drops we'll have a better openjdk build system

svn path=/nixpkgs/trunk/; revision=28479
2011-08-11 01:13:04 +00:00
Shea Levy 11ae27db30 openjdk: Add jaf sources to the drops dir
svn path=/nixpkgs/trunk/; revision=28478
2011-08-11 01:12:55 +00:00
Shea Levy ab5fc0fe11 openjdk: Download source drops ahead of time instead of allowing downloads during build
The openjdk build docs say that the releases should contain these drops, but they don't for some reason.

svn path=/nixpkgs/trunk/; revision=28477
2011-08-11 01:12:46 +00:00
Shea Levy 163260b946 openjdk: Add platforms meta attribute
svn path=/nixpkgs/trunk/; revision=28476
2011-08-11 01:12:37 +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 b1ef3e6e36 Last batch of Haskell expression updates.
* haskell-mkcabal: updated to version 1.0.0
 * haskell-ghc-syb-utils: updated to version 0.2.1.0
 * haskell-darcs: updated to version 2.5.2

svn path=/nixpkgs/trunk/; revision=28449
2011-08-10 00:35:08 +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
Michael Raskin 5fbf32b737 Missing files
svn path=/nixpkgs/trunk/; revision=28133
2011-08-03 08:38:34 +00:00
Michael Raskin 77c65a1a3b Update SBCL
svn path=/nixpkgs/trunk/; revision=28125
2011-08-02 18:52:00 +00:00
Rob Vermaas bf68854ff4 make gcc 4.1 compile
svn path=/nixpkgs/trunk/; revision=28124
2011-08-02 16:02:53 +00:00
Shea Levy c497c19c46 openjre: Call the derivation openjre instead of openjdk
svn path=/nixpkgs/trunk/; revision=28118
2011-08-01 18:48:10 +00:00
Shea Levy 02083734d1 Add openjre
svn path=/nixpkgs/trunk/; revision=28117
2011-08-01 18:48:01 +00:00
Shea Levy 9023f52855 openjdk: Don't delete src.zip, it comes with the binary distribution too
svn path=/nixpkgs/trunk/; revision=28115
2011-08-01 17:51:59 +00:00
Shea Levy 6a74987ad4 openjdk: Fix mistakenly erased square bracket
Not sure how that happend...

svn path=/nixpkgs/trunk/; revision=28100
2011-08-01 02:59:22 +00:00
Shea Levy 84529a1370 openjdk: Add meta attributes
svn path=/nixpkgs/trunk/; revision=28099
2011-08-01 01:17:42 +00:00
Shea Levy 31b09ab695 openjdk: Install build results to $out
svn path=/nixpkgs/trunk/; revision=28098
2011-08-01 01:17:33 +00:00
Shea Levy 572edb6f68 openjdk: Add patch to fix 'printf: --: invalid option' error
Thanks to http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg510739.html for the fix

svn path=/nixpkgs/trunk/; revision=28097
2011-08-01 01:17:25 +00:00
Shea Levy 43cb8fb149 openjdk: Add cpio to buildInputs
svn path=/nixpkgs/trunk/; revision=28096
2011-08-01 01:17:16 +00:00
Shea Levy ec41a120fb openjdk: Add patch to avoid an empty -I flag
svn path=/nixpkgs/trunk/; revision=28095
2011-08-01 01:17:08 +00:00
Shea Levy 0e9cda68fc openjdk: Fix an Xrender.h include
svn path=/nixpkgs/trunk/; revision=28094
2011-08-01 01:16:59 +00:00
Shea Levy c6cf3e563e Add libXi to buildInputs
svn path=/nixpkgs/trunk/; revision=28093
2011-08-01 01:16:50 +00:00
Shea Levy 09567b5caf Add libXtst to buildInputs
svn path=/nixpkgs/trunk/; revision=28092
2011-08-01 01:16:42 +00:00
Shea Levy e2f7b2087c Add libXrender to buildInputs
svn path=/nixpkgs/trunk/; revision=28091
2011-08-01 01:16:35 +00:00
Shea Levy fb896f62dd Add libXext to buildInputs
svn path=/nixpkgs/trunk/; revision=28090
2011-08-01 01:16:27 +00:00
Shea Levy 6ce3f32da2 Add libXt to buildInputs
svn path=/nixpkgs/trunk/; revision=28089
2011-08-01 01:16:19 +00:00
Shea Levy 2e0252011d Add libX11 to buildInputs
svn path=/nixpkgs/trunk/; revision=28088
2011-08-01 01:16:10 +00:00
Shea Levy 9e06eb71d6 Add alsaLib to buildInputs
svn path=/nixpkgs/trunk/; revision=28087
2011-08-01 01:16:02 +00:00
Shea Levy e052a36daf openjdk: Use the /bin/echo sed on the corba makefiles too
svn path=/nixpkgs/trunk/; revision=28086
2011-08-01 01:15:53 +00:00
Shea Levy 635dd9aac5 openjdk: Combine two seds into one
svn path=/nixpkgs/trunk/; revision=28085
2011-08-01 01:15:45 +00:00
Shea Levy f70d3b72df openjdk: We need ECHO to be echo -e, so replace the override with a sed
svn path=/nixpkgs/trunk/; revision=28084
2011-08-01 01:15:37 +00:00
Shea Levy 5fca670490 openjdk: Use makeFlags properly
svn path=/nixpkgs/trunk/; revision=28083
2011-08-01 01:15:29 +00:00