Commit graph

147 commits

Author SHA1 Message Date
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
John Wiegley
68f3d56880 Drop reference to old shelly from haskell-defaults.nix 2014-11-11 12:50:22 -06:00
Peter Simons
0b36cbf8e7 cabal-install: drop obsolete versions 0.10.2, 0.14.0, 0.6.2, 0.8.0, and 0.8.2 2014-11-08 15:50:21 +01:00
Peter Simons
b1aa6efc1a haskell-MonadRandom: drop obsolete version 0.1.13 2014-11-08 15:50:17 +01:00
Peter Simons
e1af9e865d haddock: drop obsolete versions 2.4.2, 2.7.2, 2.9.2, 2.9.4, 2.11.0, 2.12.0, 2.13.2, 2.13.2.1, 2.14.2, and 2.14.3 2014-11-08 15:50:16 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Peter Simons
0bba805fa6 haskell-defaults.nix: build 'entropy' with a recent version of Cabal on older platforms 2014-11-01 22:28:19 +01:00
Peter Simons
4c81525f9a haskell-mtl: update 2.1.x branch to version 2.1.3.1 2014-10-22 22:59:30 +02:00
John Wiegley
6558ab94a4 Elm: no longer references pandoc 2014-10-16 17:23:25 -05:00
Peter Simons
31a5126b06 Fix cabal-install build for GHC 6.10.4. 2014-10-14 17:39:36 +02:00
Peter Simons
89975f8fb2 cabal-install: build version 1.16.0.2 with network 2.5.x 2014-10-14 17:39:35 +02:00
Peter Simons
8941e6d362 haskell-defaults.nix: GHC 6.12.x cannnot build recent versions of 'vector' 2014-10-14 17:39:32 +02:00
Peter Simons
2cf6ea93fa haskell-binary: update to version 0.7.2.2 2014-10-14 17:39:31 +02:00
Peter Simons
340cca8b0e haskell-vector: add version 0.10.12.1 2014-10-14 17:39:28 +02:00
Peter Simons
bb36b56fa6 haskell-primitive: add version 0.5.4.0 2014-10-14 17:39:24 +02:00
Peter Simons
e68525310e haskell-defaults.nix: disable tf-random for GHC 6.10.x 2014-10-13 09:12:24 +02:00
Peter Simons
2da7e03ed7 cabal2nix: fix build with old versions of GHC 2014-10-08 21:04:31 +02:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Peter Simons
74d42b548a haskell-parsec: update to version 3.1.6 2014-09-14 00:06:40 +02:00
Joel Taylor
c5cb8aab31 build ghc with older binary where possible 2014-09-09 13:54:25 -07:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Peter Simons
0c3cddfc52 Build cabal-install-0.14.0 with network 2.3.x on GHC 7.4.2 and below.
Fixes <https://github.com/NixOS/nixpkgs/pull/3770>.
2014-08-25 12:17:16 +02:00
Peter Simons
3d3e78c673 network-uri: build with a recent version of Cabal on GHC 6.x 2014-08-25 12:17:15 +02:00
Peter Simons
d72b7796d1 haskell-MonadRandom: add version 0.2
We cannot use it anywhere except HEAD, unfortunately, because the
package depends on transformers 0.4.x, which is a core package and
cannot be updated.
2014-08-24 20:28:12 +02:00
Peter Simons
cbc67e1704 hsyslog: build with a recent version of Cabal on GHC 6.10.4 (and don't run Haddock) 2014-08-24 20:28:12 +02:00
Peter Simons
963c45ecf8 haskell-random: update to version 1.0.1.3
Don't update the library for GHC <= 7.4.x: https://github.com/haskell/random/issues/10
2014-08-24 20:28:12 +02:00
Peter Simons
59e15fe815 Revert "Many minor fixes to get things building after recent compiler changes".
This reverts the Haskell part of commit 326ca0f690, because these changes
broke the 'scientific' build with GHC 7.4.2.
2014-08-11 14:48:35 +02:00
John Wiegley
326ca0f690 Many minor fixes to get things building after recent compiler changes 2014-08-10 23:18:57 -05:00
Peter Simons
8ede29197f GHC 7.6.x requires older attoparsec to build with aeson 0.7.x. 2014-08-09 19:48:47 +02:00
Peter Simons
0d2463a24b GHC 7.6.x required scientific 0.2.x to build aeson 0.7.x. 2014-08-09 19:16:45 +02:00
Peter Simons
d0e37eff7b GHC 7.6 and earlier cannot compile aeson 0.8.x. 2014-08-09 19:02:56 +02:00
Peter Simons
9d56d25673 haskell-vty: update to version 5.1.3 2014-07-28 20:32:59 +02:00
Peter Simons
eec522e69a haskell-nixpkgs.nix: update Cabal to version 1.20.0.2 2014-07-28 20:32:52 +02:00
Peter Simons
b06e82fe7a haskell-defaults.nix: simplify references to the latest version of happy 2014-07-14 17:33:48 +02:00
Peter Simons
48a2253974 ghc: update version 7.8.2 to 7.8.3 2014-07-12 15:13:58 +02:00
Peter Simons
81e6e97c61 haskell-vty: update to version 5.1.1 2014-07-08 15:58:21 +02:00
Peter Simons
6d068be1bf cabal-install: update to version 1.20.0.3 2014-06-30 17:03:07 +02:00
Aycan iRiCAN
8fe08c34a4 Add binary to networkTransport again. 2014-06-21 18:06:24 +03:00
Aycan iRiCAN
719d0b64e0 Removed binary argument from networkTransport and networkTransportTcp 2014-06-21 18:01:51 +03:00
Aycan iRiCAN
88050e4a41 Moved package overrides from haskell-packages.nix to haskell-defaults.nix. 2014-06-21 17:44:29 +03:00
Peter Simons
ac56e50d3a haskell-defaults.nix: ghc-HEAD requires latest mtl 2014-06-10 20:27:20 +02:00
Mateusz Kowalczyk
3287542c57 haskell-vty: add version 5.1.0 2014-06-09 10:27:00 +02:00
Peter Simons
40eb5a5f73 haskell-system-fileio: require Cabal >= 1.8 2014-06-09 10:27:00 +02:00
Peter Simons
b134e2a0fd haskell-defaults.nix: don't provide singletons on pre-7.8.x platforms 2014-06-09 10:27:00 +02:00
Peter Simons
c7a18e326f Stick to transformers 0.3.x everywhere; the new versions breaks just about every other package that we have. 2014-06-09 10:26:59 +02:00
Peter Simons
1d50ed522a haskell-system-filepath: require at least Cabal 1.8 to build 2014-06-09 10:26:59 +02:00
Peter Simons
9dd2b3c651 haskell-shelly: move version override to haskell-defaults.nix 2014-06-09 10:26:58 +02:00
Peter Simons
4f2992c3fa Switch GHC 6.10.x to network 2.2.x because newer versions give buffering errors (according to the Cabal file from HTTP, which excludes newer versions from building) 2014-06-09 10:26:58 +02:00
Peter Simons
d07125a0d9 haskell-transformers-compat: provide different versions for GHC 7.8.2 and below
transformers is a core library in GHC 7.8.2, so that compiler is stuck
with an older version of the -compat library.
2014-06-09 10:26:58 +02:00
Peter Simons
1d392a56ae Update the default version of transformers to 0.4.1 on older compilers. 2014-06-09 10:26:56 +02:00