Commit graph

176 commits

Author SHA1 Message Date
Peter Simons f1fc78d998 haskell-defaults.nix: down-grade cabal-install to 1.20.x for GHC < 7.4.x 2015-01-05 19:52:28 +01:00
Peter Simons a0a192e318 haskell-defaults.nix: switch jailbreak-cabal back to Cabal 1.20.x.
https://github.com/peti/jailbreak-cabal/issues/3
2015-01-05 18:39:19 +01:00
Peter Simons 4f50600ae0 haskell-defaults.nix: build Cabal 1.22.x with binary 0.7.x on GHC versions < 7.8.x
https://github.com/haskell/cabal/issues/2322
2015-01-05 18:39:19 +01:00
Peter Simons 920a7cc1a8 haskell-jailbreak: use Cabal 1.22.x to build this tool 2015-01-05 18:39:19 +01:00
Ryan Trinkle e50802323c Work around issues that appear when compiling the 'split' and 'dependent-map' packages with ghcjs 2015-01-02 14:25:16 -05:00
Peter Simons 9b8ff2f5f2 Update Cabal to version 1.20.0.3 and cabal-install to version 1.20.0.6. 2015-01-01 23:07:41 +01:00
Charles Strahan 76976398f8 ghcjs: fix whitespace 2014-12-31 00:06:20 -05:00
Charles Strahan df55381b65 ghcjs: restructure 2014-12-31 00:03:43 -05:00
Charles Strahan 289e33f852 ghcjs: don't use extension for haddock override 2014-12-27 23:10:07 -05:00
Charles Strahan 780ec20283 ghcjs: regenerate extension 2014-12-27 22:31:56 -05:00
Charles Strahan e92c65f37d ghcjs: remove commented-out buildLocalCabalWithArgs 2014-12-27 22:14:17 -05:00
Charles Strahan dd28f5ff0a ghcjs: remove (seemingly) unnecessary tfRandom workaround 2014-12-27 22:12:31 -05:00
Charles Strahan a8d78dffb0 ghcjs: don't use extension to set Cabal 2014-12-27 22:09:05 -05:00
Charles Strahan d05e237cb0 ghcjs-dom: use correct conf-flags and dependencies 2014-12-27 21:40:18 -05:00
Charles Strahan 347a9674c1 ghcjs: cleanup 2014-12-27 18:48:12 -05:00
Charles Strahan f36fabb389 ghcjs: fix build 2014-12-27 16:51:39 -05:00
Charles Strahan a188373640 Merge branch 'master' of github.com:nixos/nixpkgs into ryghcjs
Conflicts:
	pkgs/development/libraries/haskell/ghcjs-dom/default.nix
	pkgs/top-level/haskell-packages.nix
2014-12-27 14:35:01 -05:00
Peter Simons 157e63c6e6 Update default Haskell compiler from GHC 7.8.3 to 7.8.4. 2014-12-24 09:56:31 +01:00
Peter Simons 8311973759 Add GHC 7.8.4 and create haskellPackages_ghc784 package set. 2014-12-23 20:44:49 +01:00
Peter Simons d461256d8b haskell-transformers-compat: update to version 0.3.3.4 2014-12-19 07:45:12 +01:00
Peter Simons b441fa9f19 haskell-defaults.nix: always build jailbreak-cabal with the latest possible Cabal version 2014-12-19 07:45:11 +01:00
Peter Simons fa165e137d cabal-install: update to version 1.20.0.4
The test suite had to be disabled because of https://github.com/haskell/cabal/issues/2285.
2014-12-18 18:36:49 +01:00
Bas van Dijk 6fa969839a Merge branch 'master' of https://github.com/NixOS/nixpkgs into update
Conflicts:
	pkgs/development/libraries/haskell/text-binary/default.nix
	pkgs/top-level/haskell-defaults.nix
	pkgs/top-level/haskell-packages.nix
2014-12-05 07:54:48 +01:00
Ryan Trinkle ed6bfa2318 Update ghcjs 2014-11-17 01:08:11 -05:00
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
Ryan Trinkle 92f8d68b99 Merge branch 'master' of https://github.com/NixOS/nixpkgs
Conflicts:
	pkgs/development/libraries/haskell/ghcjs-dom/default.nix
	pkgs/top-level/haskell-packages.nix
2014-10-06 13:12:58 -04: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
Ryan Trinkle 00b108871d ... 2014-08-27 12:14:42 -04:00
Ryan Trinkle 6f2b53400d Add a temporary workaround for https://github.com/NixOS/nixpkgs/issues/3540 2014-08-27 11:18:22 -04:00
Ryan Trinkle 17ce6ccef0 Add temporary workaround for https://github.com/NixOS/nixpkgs/issues/2689 2014-08-27 10:36:10 -04:00
Ryan Trinkle 4394858433 Integrate ghcjs
Use nixpkgs.haskellPackages_ghcjs to build packages with ghcjs.
2014-08-26 13:35:29 -04:00