Vladimír Čunát
6295a3ca36
Merge recent master into x-updates
...
Hydra: ?compare=1142825
Conflicts (easy):
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-08-02 05:08:07 +02:00
Austin Seipp
181cdb7cc8
Merge pull request #3412 from Ericson2314/rust-master
...
Add alternative rustc package for master tip
2014-07-31 21:51:21 -05:00
John Ericson
8f763d0539
rustc: rename rust to rustc, but keep rust attr name for backwards compat
2014-08-01 04:39:37 +02:00
Austin Seipp
14e477b4c4
Merge pull request #3395 from mixis/master
...
ATS2 version [0.0.7] --> [0.1.0]
2014-07-31 21:29:01 -05:00
John Ericson
641ccec337
rust: Refer to 0.11.nix directly in all-packages
...
rather than use default.nix indirection
2014-08-01 04:28:54 +02:00
John Ericson
584114b697
rust: Add an alternative package for the master tip
...
based off of pull request #3084
2014-07-31 20:42:20 +02:00
Peter Simons
c9dc75d315
idris: re-generate with cabal2nix
2014-07-31 13:57:45 +02:00
Peter Simons
689b322e10
Agda: update to version 2.4.0.2
2014-07-31 13:57:45 +02:00
John Wiegley
7d90959d73
idris: 0.9.14 -> 0.9.14.1
2014-07-30 18:11:18 -05:00
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
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
John Wiegley
5c6512434a
idris: patch 0.9.14 to workaround a bug
2014-07-24 15:48:07 -05:00
Vladimír Čunát
cbd8f7093b
gcc49: maintenance update
2014-07-23 20:19:35 +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
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
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
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
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
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