Commit graph

1954 commits

Author SHA1 Message Date
Eelco Dolstra 4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Eelco Dolstra f77abc8b7a go: Fix build
http://hydra.nixos.org/build/12538479
2014-07-22 10:49:46 +02:00
Austin Seipp f677e843d5 hhvm: remove bash input
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 19:46:32 -05:00
Austin Seipp 03fd95d248 hhvm: Fix path to /bin/bash
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 19:44:43 -05:00
Austin Seipp 4b0178d2a4 hhvm: 3.1.0 -> 3.2.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 01:58:09 -05:00
Peter Simons cdf9a972ad haskell-idris: update to version 0.9.14 2014-07-18 17:30:47 +02:00
Eelco Dolstra b4c971b14a openjdk: Update to 7u65-b32 2014-07-17 13:09:20 +02:00
taku0 c986350bfd oraclejdk: bump to 8u11 2014-07-17 10:19:51 +09:00
Eelco Dolstra 94db68d283 Move jdk -> oraclejdk 2014-07-16 18:35:35 +02:00
Eelco Dolstra c39bee0c0f oraclejdk: Export the same setup hooks as openjdk 2014-07-16 18:34:14 +02:00
Eelco Dolstra 3c58261c67 Fix setting $JAVA_HOME 2014-07-16 18:34:14 +02:00
Eelco Dolstra 63e2ec2bb8 oraclejdk: Make version consistent with openjdk 2014-07-16 18:34:14 +02:00
Eelco Dolstra 0681742627 oraclejdk: Include "oracle" in name 2014-07-16 18:34:14 +02:00
Eelco Dolstra 396a55ac18 oraclejdk: Update to 7u65 2014-07-16 17:52:46 +02:00
Eelco Dolstra caa74a146d openjdk-darwin: Update to 7u60b30 2014-07-15 11:51:07 +02:00
Eelco Dolstra ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Peter Simons 78fccddde3 ghc 7.0.2 and 7.0.3 are "broken" because of build errors with recent versions of GCC
rts/StgCRun.c: In function 'StgRunIsImplementedInAssembler':

  rts/StgCRun.c:208:1:
       error: frame pointer required, but reserved
       StgRunIsImplementedInAssembler(void)
       ^

  In file included from includes/Stg.h:230:0:
      0,
                       from rts/StgCRun.c:70:

  includes/stg/Regs.h:323:20:
       note: for 'Sp'
       GLOBAL_REG_DECL(P_,Sp,REG_Sp)
                          ^

  includes/stg/Regs.h:174:54:
       note: in definition of macro 'GLOBAL_REG_DECL'
       #define GLOBAL_REG_DECL(type,name,reg) register type name REG(reg);
                                                            ^
2014-07-12 15:13:59 +02:00
Peter Simons 48a2253974 ghc: update version 7.8.2 to 7.8.3 2014-07-12 15:13:58 +02:00
John Wiegley 324eb38313 haskell-agda-stdlib: properly reference ghc and runhaskell 2014-07-12 04:43:31 -05:00
John Wiegley c25343ef2b Merge pull request #3083 from cstrahan/darwin-openjdk
fix openjdk url for Darwin
2014-07-11 15:37:35 -05:00
Eelco Dolstra 1b391e6bf9 openjdk: Set more informative version string
Also, disable full debug symbols. Don't know if this matters because
we're already stripping everything.
2014-07-08 18:35:40 +02:00
Eelco Dolstra 639f117ec4 openjdk: Update to 7u60-b30 2014-07-08 18:35:40 +02:00
Eelco Dolstra c4877df388 openjdk: Drop dependency on CUPS
We only need the CUPS headers, not the whole package.
2014-07-08 18:35:40 +02:00
Eelco Dolstra 95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Paul Colomiets febf46bf5c rust: Update to 0.11 2014-07-03 00:52:33 +03:00
Luca Bruno aa0179744a go: fix build of 1.0.3 2014-07-02 12:12:57 +02:00
John Wiegley f666bf4ddf compcert: Correct syntax used in default.nix 2014-07-01 17:01:11 -05:00
John Wiegley 8d5c4e8b4b compcert: build with 64-bit compiler, add darwin support 2014-07-01 16:43:27 -05:00
Eelco Dolstra 0fd9db3cfb gcc-4.8: Get rid of lib64
Having a separate lib64 is bad because it requires special-casing in
lots of places.

Previously done in e4a11b4d92, which
apparently got lost going from 4.6 to 4.8.
2014-07-01 14:27:57 +02:00
Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra 89f8af55f1 Darwin: Use xcrun to get the path to the SDK
Recent versions of Xcode don't install headers in /usr/include but
in a directory like

  /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include

So use that instead, falling back to /usr/include in case of an older
version of Xcode.
2014-07-01 11:01:36 +02:00
Eelco Dolstra 55e8e0ef9b gcc: Slight builder cleanup 2014-06-30 17:31:02 +02:00
Eelco Dolstra 7fe89be146 gcc: Fix purity
Somewhere the no-sys-dirs.patch got disabled, so gcc was looking in
/usr/local/include and /usr/lib. Since I can't fix the patch easily,
I've borrowed the --sysroot trick from clang-wrapper. This causes
builtin paths to be prefixed with /var/empty
(e.g. /var/empty/usr/lib), which don't exist.
2014-06-30 16:43:02 +02:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Michael Raskin 5a8a92c01a Merge pull request #3007 from wkennington/master.syslinux
syslinux: Update 4.07 -> 6.02
2014-06-30 10:29:28 +04:00
Michael Raskin a2dacf72d3 Scala: update to 2.9.3 and fix URL
Fixes #2613

It is a pull request by taku0 with a long story…
2014-06-30 09:37:19 +04:00
Michael Raskin 12e0c22e80 Merge pull request #2610 from taku0/oraclejdk8
add oraclejdk8
2014-06-30 09:26:58 +04:00
John Wiegley e36e853817 smljnBootstrap: new expression for running smlnj on darwin 2014-06-26 15:54:45 -07:00
John Wiegley b08031ffec sbcl: use bootstrap binary on darwin 2014-06-25 22:07:55 -07:00
Charles Strahan abc3a27dbc fix openjdk url for Darwin 2014-06-25 15:01:13 -04:00
John Wiegley 8cf92b530a Merge pull request #3060 from cstrahan/packer
Add gox and packer packages
2014-06-24 15:19:42 -07:00
William A. Kennington III e543a74011 nasm: 2.11.01 -> 2.11.05 2014-06-24 16:10:13 -05:00
Domen Kožar 0e54b7980a go 1.3: doesn't evaluate on freebsd 2014-06-23 17:43:43 +02:00
Bjørn Forsman 89e6eb41f2 aliceml: description improvements
Move the (long) description to "longDescription" and add a short
description in "description".
2014-06-23 12:33:10 +02:00
Charles Strahan 06a07684aa Add gox and packer packages 2014-06-23 03:56:31 -04:00
Charles Strahan 984bb6b923 go 1.3 and darwin support 2014-06-23 01:10:20 -04:00
taku0 21643702e7 jdk7: update patchversion 55 -> 60. 2014-06-22 21:45:30 +09:00
taku0 4f745ce8b2 oraclejdk8: Add support for grsecurity 2014-06-22 21:39:37 +09:00