John Ericson
a510e024b6
rust: Add hashes for i686-darwin
2014-07-31 00:12:16 +02:00
John Ericson
399f8b48f9
rust: Prepare for more versions part 2:
...
- Default is now an alias for 0.11
2014-07-30 07:39:06 +02:00
John Ericson
210452979a
rust: Prepare for more versions part 1:
...
- Factor out some things that REALLY shouldn't change between versions
2014-07-30 07:39:06 +02:00
Eelco Dolstra
8f3dc34618
gcc-apple: Mark as broken
...
It doesn't work with the --sysroot flag passed by gcc-wrapper, and it
doesn't build with recent Xcode versions (if the SDK is not in /).
2014-07-28 18:09:53 +02:00
Michael Weiss
39c09b04c7
ATS2 version [0.0.7] --> [0.1.0]
2014-07-28 17:00:02 +02:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/applications/audio/espeak/edit.nix
pkgs/applications/audio/lmms/default.nix
pkgs/desktops/e18/enlightenment.nix
pkgs/games/exult/default.nix
pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
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 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
Vladimír Čunát
dfd80a1b7e
Merge recent master into x-updates
...
Hydra eval: 1131611
2014-06-26 22:05:15 +02:00
Vladimír Čunát
c63a9c155c
hhvm: fix build with freetype-2.5
2014-06-26 21:56:47 +02: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
Daniel Zinn
86c283824f
If cuda headers are presented to nix in $out/include they are added to future gcc calls via a -isystem flag. However, cuda does not allow kernel calls from template function if these are located in system-headers. We thus move headers from $out/include to $out/usr_include and add a custom hook to add these headers via -I.
2014-06-23 06:11:34 -07: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
taku0
a056940066
add oraclejdk8
2014-06-22 21:39:37 +09:00
John Wiegley
b24da6b15d
gccApple: Patches for building on Mavericks
2014-06-21 11:32:37 -07:00
Vladimír Čunát
3ec2cea214
Merge master into x-updates
...
Conflicts (auto-solved):
pkgs/os-specific/linux/alsa-plugins/default.nix
2014-06-20 00:24:38 +02:00
Vladimír Čunát
219cae447d
llvmPackages: maintenance update to 3.4.2
...
Updated all that was released: llvm, clang, and libc++.
2014-06-20 00:23:52 +02:00
Rob Vermaas
a975f6d8c5
Merge pull request #3016 from danielzinn/add_cuda_6
...
Added cuda6 compiler as package cudatoolkit6.
2014-06-19 14:10:36 +02:00
Mathijs Kwik
9ceeb77bd3
agda-stdlib: no need to jailbreak anymore
2014-06-19 13:38:54 +02:00
Daniel Zinn
ca0de0f1f7
Added cuda6 compiler as package cudatoolkit6.
2014-06-19 04:24:21 -07:00
Moritz Ulrich
bc41714d02
chicken: Update to 4.9.0.1.
2014-06-19 12:04:20 +02:00
Austin Seipp
b9fc9bd760
Merge pull request #2992 from bluescreen303/agda
...
Agda: upgrade stdlib to 0.8, change defaults to latest version
2014-06-18 16:22:33 -05:00
Peter Simons
f7c7282964
Merge pull request #2979 from bluescreen303/idris
...
Idris: fix wrapper for llvm, upgrade emacs-idris-mode
2014-06-18 10:00:00 +02:00
Mathijs Kwik
3fd519822f
agda-stdlib: upgrade to 0.8 (they keep changing the version scheme)
...
Conflicts:
pkgs/development/compilers/agda/stdlib-0.8.nix
pkgs/top-level/haskell-packages.nix
2014-06-17 08:25:44 +02:00
John Wiegley
61e8fe50c2
Agda: add 2.4.0.1, 2.3.2.2 is still the default for now
2014-06-16 14:03:17 -07:00
Mathijs Kwik
8d708ba35a
idris: provide boehmgc to compile with llvm backend
2014-06-16 22:43:51 +02:00
Vladimír Čunát
1b78ca58bc
Merge #2798 : stdenv and a few other big updates
...
Stdenv-changing things:
- gcc 4.8.2 -> 4.8.3
- long-running grsecurity branch
Others:
- pkgconfig update
- CVE for libtasn1, dbus
Conflicts (simple):
pkgs/development/compilers/ghc/7.6.3.nix
2014-06-16 10:23:36 +02:00
Vladimír Čunát
9757785295
Merge recent master
2014-06-15 17:55:35 +02:00
Peter Simons
132309de52
scala: cosmetic fix for syntax highlighting in Emacs
2014-06-15 17:12:14 +02:00
Robert M. Mather
2d6d52bb2a
Ur/Web compiler: new release, 20140426 -> 20140531
2014-06-13 18:22:34 -07:00
Peter Simons
e9bbb1ede9
haskell-idris: update to version 0.9.13.1
2014-06-13 15:41:22 +02:00
Austin Seipp
3e76f3922f
Merge pull request #2801 from orbitz/haxe-3.1.3
...
Add HaXe 3.1.3
2014-06-12 20:41:58 -05:00
Vladimír Čunát
de12094b0e
Merge recent master
2014-06-12 09:15:11 +02:00
Vladimír Čunát
34091bf265
cudatoolkit: fix multiple outputs ( close #2466 )
2014-06-11 21:32:13 +02:00
Austin Seipp
509beb1f68
Add HHVM packages, replacing old hiphop-php expr
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-10 13:28:35 -05:00
Peter Simons
abff388c20
ghc-head: update to version 7.9.20140608
2014-06-10 20:27:20 +02:00
Vladimír Čunát
f2352f7ecf
Merge recent master
2014-06-10 20:14:08 +02:00
Vladimír Čunát
5a98b9f514
Merge recent master into p/stdenv
...
Merged just before the pypi update, as it seems to cause problems on Hydra.
2014-06-09 19:07:31 +02:00