2689 Commits

Author SHA1 Message Date
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
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46e71e1907d78b71fab36df30297b3ad.
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