Luca Bruno
b83aceaecb
Merge branch 'master' into staging
2014-08-14 23:09:59 +02:00
Vladimír Čunát
d1ed0f44cd
Merge #2823 : better cygwin support, also add x86_64
...
Conflicts (easy):
pkgs/development/interpreters/perl/5.16/default.nix
2014-08-14 20:38:09 +02:00
Vladimír Čunát
45371d380c
thrift: disable parallel building, as it fails on hydra
2014-08-14 18:17:50 +02:00
Oliver Charles
adea4335a1
haskellPackages.jsonAssertions: Update to 1.0.4
2014-08-14 14:38:53 +01:00
Peter Simons
f226e6c40c
haskell-text-icu: this package is broken on Darwin
...
See <https://github.com/bos/text-icu/issues/6 >.
2014-08-14 14:41:22 +02:00
Peter Simons
77a31ddec1
haskell-pure-cdb: re-generate with cabal2nix
2014-08-14 14:41:22 +02:00
Peter Simons
1c29dba62a
haskell-pointfree: re-generate with cabal2nix
2014-08-14 14:41:22 +02:00
Peter Simons
423f789602
haskell-pointful: re-generate with cabal2nix
2014-08-14 14:41:22 +02:00
Peter Simons
09d214dfbf
haskell-hscope: re-generate with cabal2nix
2014-08-14 14:41:22 +02:00
Peter Simons
c927ff60c8
haskell-HaskellNet: re-generate with cabal2nix
2014-08-14 14:41:22 +02:00
Peter Simons
4e45e7c60f
haskell-docs: re-generate with cabal2nix
2014-08-14 14:41:22 +02:00
Thomas Strobel
637ed1642e
Add Haskell package: pointfree
2014-08-14 14:41:22 +02:00
Peter Simons
d65256d495
Merge pull request #3580 from ts468/lib-xylib
...
Add library: xylib
2014-08-14 13:57:34 +02:00
Peter Simons
758838df2b
Merge pull request #3579 from ts468/haskell-haskell-docs
...
Add Haskell package: haskell-docs
2014-08-14 13:56:24 +02:00
Peter Simons
91ce5a47a6
Merge pull request #3578 from ts468/haskell-hscope
...
Add Haskell packages: hscope and pure-cdb
2014-08-14 13:55:55 +02:00
Michael Raskin
8da8c805bb
Update luarocks
2014-08-14 10:14:21 +04:00
Aycan iRiCAN
0fcc634d59
Merge pull request #3576 from ts468/haskell-pointful
...
Add Haskell package: pointful
2014-08-14 08:49:16 +03:00
lethalman
f65202666c
Merge pull request #3581 from ts468/wxGTK301
...
Update wxWidgets to: wxGTK 3.0.1
2014-08-14 01:56:27 +02:00
Thomas Strobel
1234a0ac56
Update wxWidgets to: wxGTK 3.0.1
2014-08-14 01:46:26 +02:00
Thomas Strobel
6819a069e3
Add library: xylib
2014-08-14 01:14:06 +02:00
Thomas Strobel
aab5ab8711
Add Haskell package: haskell-docs
2014-08-14 01:00:31 +02:00
Thomas Strobel
f2e30cb9b2
Add Haskell package: pointful
2014-08-14 00:40:33 +02:00
Thomas Strobel
26bda4eb00
Add Haskell packages: hscope and pure-cdb
2014-08-14 00:35:32 +02:00
Thomas Strobel
cd9f3db40b
Add Haskell package: pointful
2014-08-13 23:38:34 +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
Hoang Xuan Phu
f7a460af14
add HaskellNet
2014-08-13 21:55:11 +08:00
Peter Simons
cdabab5b28
Merge pull request #3555 from tomberek/haskell_hplayground
...
Haskell hplayground
2014-08-13 15:39:07 +02:00
Aycan iRiCAN
241bb984b1
Merge pull request #3564 from ttuegel/haskell
...
Add haskell-formatting-5.2
2014-08-13 15:18:11 +03:00
Thomas Tuegel
631f8cacb0
Add haskell-formatting-5.2
2014-08-13 06:58:37 -05:00
Mateusz Kowalczyk
fc5c0ffc54
haskell-rest-gen: jailbreak
2014-08-13 12:43:12 +01:00
Mateusz Kowalczyk
7794ad39b7
haskell-rest-core: jailbreak
2014-08-13 12:33:51 +01:00
Mateusz Kowalczyk
408473b406
Regenerate few packages with cabal2nix
2014-08-13 12:32:56 +01:00
Rickard Nilsson
c00ab086d5
remarkjs: Update from 0.6.4 to 0.6.5
2014-08-13 12:03:51 +02:00
Austin Seipp
6bd1b35509
arcanist: 20140717 -> 20140812
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-12 21:52:35 -05:00
tomberek
0e24703c5b
Add haste-perch for hplayground
2014-08-12 20:45:22 -04:00
tomberek
e3ad8ba4be
Adds hplayground, needs hastePerch
2014-08-12 20:37:22 -04:00
Vladimír Čunát
48c5574f5a
webkitgtk: minor update
2014-08-13 00:20:46 +02:00
Vladimír Čunát
b07f646613
gst-1 gnonlin and editing-services: maintenance update
2014-08-12 22:35:49 +02:00
Vladimír Čunát
3f6d1d08f2
gst_1 python: bugfix update
2014-08-12 22:18:25 +02:00
Vladimír Čunát
6a164e24ae
gst_1 base plugins: enableParallelBuilding
...
This package seems to be quite a bottleneck otherwise.
2014-08-12 22:17:38 +02:00
Vladimír Čunát
d66c0a55da
merge #3342 : update gstreamer to 1.4.0
2014-08-12 22:15:42 +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
Vladimír Čunát
566058b477
Merge #3152 : add pyqt5
2014-08-12 20:33:34 +02:00
Oliver Charles
4e2adbeb4d
haskellPackages.bound: New expression
2014-08-12 18:11:33 +01:00
Vladimír Čunát
665b2c8247
Merge #3408 : licenses: prefer spdx.org, improve docs
...
The patch to allow using license shortnames as attributes
was not included (yet).
Conflicts (auto-solved):
pkgs/development/libraries/libtiff/default.nix
2014-08-12 19:08:53 +02:00
John Wiegley
01ecaf98a5
haskell-lambdabot: only mark as broken for GHC 7.8.3
2014-08-12 11:53:01 -05:00
John Wiegley
62ceaca0b9
haskell-djinn: only mark as broken for GHC 7.8.3
2014-08-12 11:52:38 -05:00
Emil Rangden
3a4fc75f52
jailbreak http-attoparsec list-tries and socket-io
2014-08-12 16:10:00 +02:00