Vladimír Čunát
52d9c93abe
Merge 'staging' into master
2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618
Mark a bunch of packages as broken or not supported on Darwin
2014-08-08 17:59:02 +02:00
Peter Simons
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
Peter Simons
b6e2a52b72
Merge pull request #3418 from peti/drop-obsolete-agda-version
...
Agda: drop obsolete version 2.3.2.2
2014-08-06 13:39:30 +02:00
Michael Raskin
e27a887440
Give up for now: roll back SBCL to 1.2.0, as: 1.2.2 fails on i686; 1.2.1 fails everywhere
2014-08-04 19:57:01 +04:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Michael Raskin
0ca8dfe805
Remove SBCL updater file: home page allows automatic updates
2014-08-03 22:29:41 +04:00
Michael Raskin
09b3fd0eb2
Update SBCL Common Lisp compiler
2014-08-03 22:29:41 +04:00
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
84cf3f3de7
Agda: drop obsolete version 2.3.2.2
2014-07-31 13:58:36 +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
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
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