John Wiegley
5c6512434a
idris: patch 0.9.14 to workaround a bug
2014-07-24 15:48:07 -05:00
Eelco Dolstra
ac8775dd96
$xcodePath -> $SDKROOT
...
SDKROOT is standard. In particular, this fixes the cmake build on
Mac OS X 10.9.
2014-07-24 21:53:46 +02:00
Vladimír Čunát
cbd8f7093b
gcc49: maintenance update
2014-07-23 20:19:35 +02:00
Vladimír Čunát
b9045a7d96
Merge branch 'x-updates' into staging
...
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Eelco Dolstra
5add082ab8
gcc-4.2: Remove
2014-07-22 15:12:21 +02:00
Eelco Dolstra
ee39b4e82e
opencxx: Remove
...
It's unused and unmaintained.
2014-07-22 15:12:21 +02:00
Eelco Dolstra
e0c43e8d04
llvm: Removed unused versions 3.1 and 3.2
2014-07-22 13:56:26 +02:00
Eelco Dolstra
402688b752
gcc: Fix multilib builds
...
http://hydra.nixos.org/build/12578050
2014-07-22 13:36:00 +02:00
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
Vladimír Čunát
9b02635faa
Merge recent master into x-updates
...
Hydra: ?compare=1138350
Conflicts:
nixos/modules/services/x11/desktop-managers/default.nix
Two imports were added independently on the same line.
I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Florent Becker
c59819311c
Make x11 optionnal for ocaml
2014-07-21 11:27:09 +02:00
drozv
29d5629074
Fix x11 include and lib parameters for configure script.
2014-07-21 11:13:45 +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
Vladimír Čunát
16e35532e4
Merge recent master into x-updates
2014-07-17 19:30:56 +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
Boris Sukholitko
10981178a9
Add emscripten: LLVM to JavaScript compiler
2014-07-12 18:17:50 +03: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
Vladimír Čunát
5979d428b4
Merge recent master into x-updates
...
Hydra: ?compare=1134869
Conflicts (just meta):
pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02: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
Vladimír Čunát
aceb30cd93
Merge master into x-updates
...
Adds the mass-rebuilding python update.
2014-07-02 22:54:41 +02: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 e4a11b4d92424c42f61ee55cf505ac1217944f4a, 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