JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
47,267 Commits 2 Branches 0 Tags 12 GiB
3dbdd263f4
Commit Graph

2011 Commits

Author SHA1 Message Date
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
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
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
Vladimír Čunát
5e37c09f06 ghc on darwin: second attempt to fix build 
Tested not to affect hash on linux.
 2014-06-09 19:01:49 +02:00
Peter Simons
b5e87f63f9 haskell-idris: update to version 0.9.13 2014-06-09 10:26:57 +02:00
Austin Seipp
8155e5d119 compcert: fix build by adding menhir dependency 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-09 01:25:27 -05:00
Austin Seipp
8c0b63162b compcert: 2.2 -> 2.3pl2 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
 2014-06-06 23:09:47 -05:00
Eelco Dolstra
1da6a7d4a9 Remove illegal meta.src attributes 2014-06-05 13:04:18 +02:00
Austin Seipp
cd6cf75720 Merge pull request #2787 from doublec/aliceml 
Alice ML 1.4 programming language
 2014-06-03 20:36:44 -05:00
Shea Levy
2943fe1e76 go: bump 2014-06-03 13:51:37 -04:00
Moritz Ulrich
088cb87e8c chicken: Bump to 4.9.0. 2014-06-02 18:15:44 +02:00
Malcolm Matalka
27e2e4132b Add HaXe 3.1.3 2014-06-01 15:15:15 +02:00
John Wiegley
0369769bd9 gcc-4.8: build Objective-C/C++ support on darwin 2014-05-31 19:39:09 +00:00
Vladimír Čunát
789b1d613c ghc on darwin: attempt to fix build 2014-05-30 23:13:49 +02:00
Vladimír Čunát
628ac8b087 older GHCs: fix build after gcc-4.8.3 bump 
Getting "frame pointer required, but reserved" while compiling runtime.
Thanks to @jwiegley for suggestion of the work-around.
 2014-05-30 23:10:19 +02:00
Vladimír Čunát
4d269593d2 dragonegg: fix build, probably after gcc minor update 2014-05-30 11:03:54 +02:00
Vladimír Čunát
872860e6de Merge #1187 into p/stdenv 
Tested building firefox, kdelibs, evince on x86_64-linux.
 2014-05-29 22:16:07 +02:00
Chris Double
b793f92233 Alice ML 1.4 programming language 2014-05-29 13:18:31 +12:00
Peter Simons
5c3c688f7b Elm: fix build by ignoring the build instructions provided by upstream 
Re-apply the build fix from <https://github.com/NixOS/nixpkgs/issues/2089>,
because apparently the underlying issue has not been fixed.

According to <https://github.com/elm-lang/Elm/issues/384>, Elm's release
archive comes with a Setup.hs that cannot compile an Elm release. Duh!
Replacing the custom Setup.hs file with a dummy version fixes this issue.
 2014-05-28 12:48:29 +02:00
Michael Raskin
66925a57ba Updating SBCL to 1.2.0 2014-05-28 01:33:28 +04:00
宋文武
0f65f11d6e mono: fix libgdiplus finding 2014-05-27 20:08:50 +02:00
Chris Double
c05f252dac Definitions for Open Dylan 2013.2 (Dylan Language Implementation) 2014-05-27 20:27:47 +12:00
Vladimír Čunát
ba190a71c7 Merge branch 'master' into p/stdenv 2014-05-26 19:35:47 +02:00