Ricardo M. Correia
7068828389
rustcMaster: Update to a more recent commit
2014-09-14 04:54:33 +02:00
Peter Simons
686ea115a9
idris: broken by recent Haskell updates
...
http://hydra.cryp.to/build/190927/nixlog/1/raw
2014-09-14 00:06:43 +02:00
Peter Simons
3f2c6833ac
idris: remove unnecessary jailbreak
2014-09-14 00:06:42 +02:00
Vincent Laporte
829c49a686
Adds mezzo
...
Mezzo is a programming language in the ML tradition, which places strong
emphasis on the control of aliasing and access to mutable memory.
Homepage: http://protz.github.io/mezzo/
2014-09-13 12:26:07 +02:00
Bruce Mitchener
5e367ec9d7
dylan: Remove old gwydion-dylan package.
...
The Gywdion Dylan compiler that was packaged here is old and this
package no longer builds. The Gwydion Dylan compiler is no longer
maintained, and has been replaced by the Open Dylan compiler which
is already packaged in Nix (opendylan).
2014-09-12 12:27:58 +07:00
Mateusz Kowalczyk
d50c0e75b8
agda: fix license
2014-09-11 20:35:56 +01:00
Mateusz Kowalczyk
ee31679bad
agda-stdlib: make expression nicer, fix license
2014-09-11 20:35:56 +01:00
Rob Vermaas
a904585789
scala: update from 2.11.0 to 2.11.1
2014-09-11 13:32:33 +02:00
Eelco Dolstra
585983bc95
Merge remote-tracking branch 'origin/staging'
...
Conflicts:
pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Vladimír Čunát
06fea81c6e
Merge recent master into staging
...
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Robert M. Mather
98a4675581
Ur/Web compiler: new release, 20140531 -> 20140830
2014-09-06 11:05:10 +02:00
Domen Kožar
f9ba413b55
fix eval
2014-09-05 00:06:11 +02:00
Michael Raskin
014f7ad100
Merge pull request #3955 from paulkoerbitz/master
...
Update oraclejdk-7 patch version from 65 to 67
2014-09-04 20:20:01 +04:00
Peter Simons
0a6ad14395
haskell-idris: update to version 0.9.14.3
2014-09-04 14:41:09 +02:00
Michael Raskin
a517dfcf71
Fix ACL2
2014-09-04 14:41:35 +04:00
Peter Simons
ca931e0e1e
Merge pull request #3915 from Fuuzetsu/agda-builder
...
RFC: Agda builder
2014-09-04 11:28:47 +02:00
Paul Koerbitz
b8a88ce472
Update oraclejdk-7 patch version from 65 to 67
2014-09-03 21:30:31 +02:00
Ricardo M. Correia
e552fbf521
gcc/gcj: Update antlr dep to 4.4
...
Version 3.1.3 is no longer available for download.
2014-09-03 14:04:52 +02:00
Peter Simons
1c0d15b90e
Merge branch 'origin/master' into staging.
...
Conflicts:
pkgs/development/libraries/ffmpeg/2.x.nix
pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Michael Raskin
24b4105ed7
Remove fpc 2.4.0: lazarus doesn't need it and it doesn't like .2.6.0 as bootstrap compiler
2014-09-01 08:56:37 +04:00
Mateusz Kowalczyk
61c17e326f
Use agda builder for stdlib. mv to all-packages
2014-09-01 01:38:01 +01:00
Michael Raskin
2406a89219
Update FPC to 2.6.4
2014-08-31 22:47:55 +04:00
Michael Raskin
6b962e6e9e
Update FPC binary expression
2014-08-31 22:47:55 +04:00
Mateusz Kowalczyk
b1e388cefb
agda-stdlib: update to 0.8.1
...
This is necessary after the Agda-2.4.2 bump
2014-08-31 19:26:05 +01:00
Peter Simons
6ea21ad737
haskell-Agda: update to version 2.4.2
...
I had to disable the Haddock phase because of lots of errors:
http://hydra.cryp.to/build/181564/nixlog/1/raw
2014-08-31 18:17:01 +02:00
Peter Simons
c04507ea3e
haskell-idris: update to version 0.9.14.2
2014-08-31 18:17:00 +02:00
Michael Raskin
5fc69283f5
Update SBCL
2014-08-31 18:20:07 +04:00
Vladimír Čunát
e51f73652d
Merge recent master into staging
...
Hydra: ?compare=1149952
Conflicts:
nixos/doc/manual/configuration.xml (changed split file)
nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Shea Levy
ceb367a8a2
ats2: Bump
2014-08-29 16:13:48 -04:00
Gergely Risko
dd3f3bdcc2
GCC >= 4.8 doesn't depend on ppl
2014-08-29 11:45:22 +02:00
Michael Raskin
f25709c48a
List NCSA license properly
2014-08-29 01:14:10 +04:00
Michael Raskin
55cc5736a9
Merge pull request #3255 from bosu/emscripten2
...
Add emscripten: LLVM to JavaScript compiler (take 2)
2014-08-29 01:04:26 +04:00
Shea Levy
013aedffea
ats2: bump
2014-08-27 22:51:27 -04:00
Bjørn Forsman
c9baba9212
Fix many package descriptions
...
(My OCD kicked in today...)
Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.
I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.
I've tried to stay away from generated expressions (and I think I
succeeded).
Some specifics worth mentioning:
* cron, has "Vixie Cron" in its description. The "Vixie" part is not
mentioned anywhere else. I kept it in a parenthesis at the end of the
description.
* ctags description started with "Exuberant Ctags ...", and the
"exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
at the end of description.
* nix has the description "The Nix Deployment System". Since that
doesn't really say much what it is/does (especially after removing
the package name!), I changed that to "Powerful package manager that
makes package management reliable and reproducible" (borrowed from
nixos.org).
* Tons of "GNU Foo, Foo is a [the important bits]" descriptions
is changed to just [the important bits]. If the package name doesn't
contain GNU I don't think it's needed to say it in the description
either.
2014-08-24 22:31:37 +02:00
Eelco Dolstra
2d6d43c02c
Fix tarball build
2014-08-24 18:52:50 +02:00
Domen Kožar
fc5f6e4e79
tarball fixes
2014-08-24 16:02:57 +02:00
Michael Raskin
33ef69390b
Fix Julia 0.3.0 build (for most purposes). Not making default yet because it is unclear if I missed something important. Failed to make it use external openblas and lapack correctly…
2014-08-24 00:24:55 +04:00
Vladimír Čunát
0df6ccb4b6
orc: disable tests on i686
...
The failing test doesn't even work in the commit that introduced it.
2014-08-23 15:17:06 +02:00
Michael Raskin
ff0582f185
Merge pull request #3649 from daogames/tb/update-golang
...
golang: bump to 1.3.1
2014-08-23 13:05:30 +04:00
Michael Raskin
e4f9e321ca
Merge pull request #3069 from danielzinn/add_cuda_6
...
Allowing cuda to use its own thrust library
2014-08-23 11:13:20 +04:00
Eelco Dolstra
ce6b86cc68
Fix various evaluation problems
...
http://hydra.nixos.org/build/13616685
2014-08-22 11:57:40 +02:00
Michael Raskin
d2539c6ff5
Adding Julia 0.3.0: some progress, but doesn't work yet
2014-08-21 22:09:55 +04:00
Pascal Wittmann
bc7fe78d19
mit-scheme: update from 9.1.1 to 9.2 and remove broken tag
...
closes #3705
2014-08-21 19:40:53 +02:00
Vladimír Čunát
315b8ec8f6
orc: bugfix updates
2014-08-21 15:13:21 +02:00
Vladimír Čunát
d4e9fd2a90
Merge recent master into staging
...
Hydra: ?compare=1148749
Conflicts (easy):
nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
Peter Simons
e910c8d6c9
Disable Hydra builds for broken Haskell packages.
...
The following packages are broken with GHC 7.8.3:
- filesystem-conduit version 1.0.0.2
- ghc-events-analyze version 0.2.0
- haskelldb version 2.2.2
- haskell-mpi version 1.2.1
- haxr-th version 3000.5
- hoauth version 0.3.5
- holy-project version 0.1.1.0
- hoogle version 4.2.32
- hspread version 0.3.3
- instant-generics version 0.4
- ivor version 0.1.14.1
- jmacro-rpc-happstack version 0.3
- lambdacube-engine version 0.2.4
- language-c-inline version 0.6.0.0
- lockfree-queue version 0.2.3
- monad-peel version 0.1.1
- network-transport-tests version 0.1.0.1
- poppler version 0.12.3
- profiteur version 0.1.2.1
- prolog-graph-lib version 0.2.0.1
- semigroupoid-extras version 4.0
- setlocale version 0.0.3
- sized-types version 0.5.0
- snaplet-postgresql-simple version 0.5
- snap-loader-dynamic version 0.10.0.2
- uhc git version 20120502
- uniqueid version 0.1.1
- unix-process-conduit version 0.2.2.3
- vado version 0.0.1
- vcsgui version 0.0.4
- xml-html-conduit-lens version 0.3.2.0
The following packages depend on one of the broken ones above:
- hoodle-builder version 0.3
- hoodle-core version 0.14
- hoodle-extra version 0.1
- hoodle-parser version 0.3
- hoodle-render version 0.4
- hoodle-types version 0.3
- hoodle version 0.3
- kansas-lava version 0.2.4
- liblastfm version 0.4.0.0
- prolog-graph version 0.1.0.2
- vacuum-cairo version 0.5
- wcwidth version 0.0.2
2014-08-20 20:26:57 +02:00
Austin Seipp
d95ae1cc89
fsharp: 3.1.0 -> 3.1.1.25
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 02:03:18 -05:00
Austin Seipp
f1bc7b229d
jhc: 0.8.1 -> 0.8.2
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 01:43:31 -05:00
Ryan Newton
56d15045fa
Bump ghc-head to latest.
2014-08-19 23:47:58 +02:00
Ryan Newton
e59a29df13
manticore: Remove name from description
2014-08-19 10:27:20 -04:00
Ryan Newton
ff6057d686
Add parallel functional compiler, Manticore
2014-08-19 02:36:57 -04:00
Eelco Dolstra
a0c60b76ec
gcc: Revive the no-sys-dirs patch
...
For now, we don't NATIVE_SYSTEM_HEADER_DIR because it breaks the
build. However, it points to Glibc in the Nix store (not /usr/include)
so it's kind of okay.
2014-08-18 17:20:37 +02:00
Tino Breddin
f513e383ef
golang: bump to 1.3.1
2014-08-17 21:08:45 +02:00
Luca Bruno
b83aceaecb
Merge branch 'master' into staging
2014-08-14 23:09:59 +02:00
Gergely Risko
f199e115d2
Enable parallel building for GCC.
...
Even if using profiledbootstrap. This was unsafe before 4.8, and
then the documentation was not fixed on time.
The documentation got fixed here:
c763997f34
But the actual code was already fixed here:
5d2fca09d5
So this is safe both for GCC 4.8 and GCC 4.9.
2014-08-13 23:21:33 +02:00
Vladimír Čunát
08f5932729
ocaml: refactor the useX11 check to actually work
2014-08-12 21:53:02 +02:00
Vladimír Čunát
141b5d961f
Merge master into PR
...
Conflicts:
pkgs/development/compilers/ocaml/4.01.0.nix
2014-08-12 21:52:20 +02:00
drozv
33fec9d04d
ocaml: fix x11 include and lib parameters for configure script
...
Close #2923 , fixes #2922 .
2014-08-12 21:41:37 +02:00
Michael Raskin
4ab466cc56
Update OpaLang; it still doesn't build for a mysterious reason: apparently the missing fields are actually defined…
2014-08-12 16:22:25 +04:00
Peter Simons
e823c123a8
Don't build broken Haskell packages on Hydra.
...
These packages don't compile:
- cabal-delete
- cabal-file-th
- categories
- cmdtheline
- codec-image-devil
- concurrent-extra
- cryptol 1.8.x
- data-lens
- diagrams-postscript
- djinn
- download
- dstring
- enummapset
- git-date
- github-backup
- gtkglext
- happyy-meta
- haskeline-class
- pakcs
These packages depend on some of the packages listed before:
- Chart-diagrams
- data-lens-template
- hp2any-manager
- purescript
- repr
These packages fail with GHC 7.8.3 but still compile with older compilers:
- happy: 1.18.4, 1.18.5, 1.18.6
2014-08-12 12:37:44 +02:00
Peter Simons
f9f26acd4a
pakcs: it appears that upstream changed the source code without bumping the version number
2014-08-12 12:37:44 +02:00
Michael Raskin
28c7ff430e
Set more realistic platform set for Stalin Scheme compiler
2014-08-12 04:35:34 +04:00
Mateusz Kowalczyk
686190da2e
haskell-epic: mark as broken
...
https://github.com/edwinb/EpiVM/issues/6
2014-08-11 13:58:40 +02:00
Vladimír Čunát
dda3e97ecf
gcc33: no longer broken, apparently
...
I even got binaries from Hydra, although I don't know why.
2014-08-10 18:25:34 +02:00
Eelco Dolstra
be399bf245
Hack to fix llvm/clang build on Darwin
...
(Or at least restore it to the same level as brokenness as before the
staging merge. I.e. it depends on gcc-apple, which doesn't build on
standard 10.9 systems.)
2014-08-09 23:31:00 +02:00
lethalman
05eb5bf913
Merge pull request #3503 from lethalman/platforms
...
Make platforms.allBut accept a list rather than a single platform
2014-08-09 14:22:09 +02:00
Peter Simons
18250b97ae
Remove 'andres' from the meta.maintainer section of all Haskell package where I
...
had added him earlier.
2014-08-09 13:49:24 +02:00
Luca Bruno
b331ae33d7
Make platforms.allBut accept a list rather than a single platform
2014-08-09 12:31:33 +02:00
Luca Bruno
9300470b5e
chicken: broken on darwin
2014-08-09 12:29:27 +02:00
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
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