Commit Graph

216 Commits

Author SHA1 Message Date
Peter Simons
4e2e36f388 hackage-packages.nix: update to 31bc649141 with hackage2nix revision 8e3ad6c8af82151574e87c1e9c9ec6cbb5841b3d 2015-05-16 21:59:36 +02:00
Peter Simons
4ead7bc0b7 hackage-packages.nix: update to 65d3f6a305 with hackage2nix revision 4c63d4ad559c7c9569df1ea07557f92a1cfb5a3e 2015-05-11 17:01:56 +02:00
Domen Kožar
bb4d658f64 Merge branch 'master' into staging
Conflicts:
	nixos/doc/manual/release-notes/rl-unstable.xml
	nixos/modules/services/printing/cupsd.nix
	pkgs/applications/misc/calibre/default.nix
	pkgs/development/haskell-modules/hackage-packages.nix
	pkgs/development/libraries/libsodium/default.nix
	pkgs/misc/emulators/wine/unstable.nix
	pkgs/top-level/all-packages.nix
2015-05-11 10:05:23 +02:00
Peter Simons
7b49289c74 hackage-packages.nix: update to 4f492cbdcc with hackage2nix revision 4c63d4ad559c7c9569df1ea07557f92a1cfb5a3e 2015-05-10 22:14:42 +02:00
codyopel
c250cf6f53 libsodium: refactor & remove duplicate 2015-05-10 13:46:29 +02:00
Peter Simons
d484328619 hackage-packages.nix: update to 7424fa13db with hackage2nix revision 5e6df99a29c3e80bb071af288038312b19baf022 2015-05-10 13:46:01 +02:00
Peter Simons
132e0fed79 hackage-packages.nix: update to 533fd30acc with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba 2015-05-10 13:46:00 +02:00
codyopel
7a794e1797 libsodium: refactor & remove duplicate 2015-05-09 18:20:06 -04:00
Peter Simons
31b330828c hackage-packages.nix: update to 7424fa13db with hackage2nix revision 5e6df99a29c3e80bb071af288038312b19baf022 2015-05-09 14:16:43 +02:00
Peter Simons
d9411d53e9 hackage-packages.nix: update to 533fd30acc with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba 2015-05-09 11:26:09 +02:00
Peter Simons
e930cf057e hackage-packages.nix: update to d338756e7c with hackage2nix revision f8474108eabeb513175d845709f749070ffdd8ba 2015-05-08 14:10:15 +02:00
Peter Simons
06255562b6 hackage-packages.nix: update to a194932779 with hackage2nix revision db53ac3a644eebda581c9f036ccd55a19ff3c629 2015-05-05 21:44:48 +02:00
Peter Simons
01ba9d0dec hackage-packages.nix: update to 69ffcf7c20 with hackage2nix revision 936f7d1dd81cf86df3d79e4e38d17dc68e2a561e 2015-05-05 21:44:47 +02:00
Peter Simons
1650292b65 hackage-packages.nix: update to 9c68a9d77e with hackage2nix revision a92f66b20fe51e401d0d4d945beeae82093f8d43 2015-05-05 21:44:47 +02:00
Peter Simons
53598090ea hackage-packages.nix: update to 461332b5dd with hackage2nix revision a92f66b20fe51e401d0d4d945beeae82093f8d43 2015-05-05 19:18:19 +02:00
Peter Simons
34c533009d hackage-packages.nix: update to 377c4aff87 with hackage2nix revision e4785fc969ad3ea9d2fdda94a86d0fff9c56721c 2015-05-05 12:54:48 +02:00
Peter Simons
cf230ccc82 hackage-packages.nix: update to 7291c193bd with hackage2nix revision 1e8c48d7b3a9b73489d686ee1ae44f4198130294 2015-05-04 15:49:46 +02:00
Peter Simons
9b27a88b66 hackage-packages.nix: update to 5f6d964cba with hackage2nix revision 913111f692c1890208c98f0fd73dbe1b711c789b 2015-04-29 12:22:20 +02:00
Peter Simons
f426922f4a hackage-packages.nix: update to 44775051f9 with hackage2nix revision 913111f692c1890208c98f0fd73dbe1b711c789b 2015-04-28 17:57:04 +02:00
Peter Simons
2028ece4a8 hackage-packages.nix: update to 0342de381c with hackage2nix revision 0d45926218066869f16d55d970cac0d6b50d9ebd 2015-04-27 17:24:10 +02:00
Peter Simons
0241c1f25c hackage-packages.nix: update to 30bfb9f702 with hackage2nix revision 0d45926218066869f16d55d970cac0d6b50d9ebd 2015-04-27 13:09:40 +02:00
Peter Simons
08f0e0208a hackage-packages.nix: update to bf1b180f9d with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-26 16:53:47 +02:00
Peter Simons
effd525c55 hackage-packages.nix: update to ea1e77a413 with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-26 13:06:35 +02:00
Peter Simons
c59420a856 hackage-packages.nix: update to abae36d131 with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-26 11:47:44 +02:00
Peter Simons
24f50d3e22 hackage-packages.nix: update to cc08310397 with hackage2nix revision c84f676708fec9d3a848f466468db04c7e641069 2015-04-25 17:57:32 +02:00
Peter Simons
2ca6148bc7 hackage-packages.nix: re-generate from Hackage state 5af579af59 2015-04-25 17:09:04 +02:00
Peter Simons
5fade2b6aa hackage-packages.nix: re-generate from Hackage state f3fe5bb92d 2015-04-24 11:22:47 +02:00
Peter Simons
4e679f0ca3 hackage-packages.nix: re-generate from Hackage state fdf6d76660 2015-04-23 19:55:55 +02:00
Peter Simons
8a9de1effd hackage-packages.nix: re-generate from Hackage state 318f4faa8b 2015-04-23 11:34:05 +02:00
Peter Simons
32c0d3bd4f hackage-packages.nix: re-generate from Hackage state 12d6257d3e 2015-04-21 14:16:20 +02:00
Peter Simons
26941230b5 hackage-packages.nix: re-generate from Hackage state e1a69962dc 2015-04-20 22:05:33 +02:00
Peter Simons
82f22dd5a1 hackage-packages.nix: disable approx. 1,000 Hydra build that are known to fail with GHC 7.10.1 2015-04-20 17:40:16 +02:00
Peter Simons
2799cf5e1b hackage-packages.nix: re-generate from Hackage state ea1b618ac7 2015-04-20 17:40:14 +02:00
Peter Simons
b6944026c6 haskell-hruby: add missing system dependency and disable broken test suite
Work around https://github.com/bartavelle/hruby/issues/10 and
https://github.com/bartavelle/hruby/issues/9 as suggested in
https://github.com/NixOS/nixpkgs/pull/7442.
2015-04-20 00:06:52 +02:00
Peter Simons
bfe4b07321 hackage-packages.nix: re-generate from Hackage state be5b264dd1 2015-04-20 00:06:52 +02:00
Peter Simons
09fe56f2e5 haskell-ng: switch default configuration to mtl 2.2.x 2015-04-18 20:43:23 +02:00
Peter Simons
c434966fe0 hackage-packages.nix: re-generate from Hackage state 81d069379a 2015-04-18 20:43:22 +02:00
Ian-Woo Kim
ca5e8df0f4 haskell-distributed-process-*: disable several checkPhases and haddockPhases for distributed-process-* packages and cloud-haskell.
Resolved https://github.com/NixOS/nixpkgs/pull/7335.
2015-04-14 14:34:38 +02:00
Peter Simons
ccbe00dafb hackage-packages.nix: re-generate from Hackage 2015-04-13T23:41:21+0200 2015-04-14 14:22:21 +02:00
Shea Levy
526bf50e2e data-clist: Bump to 0.0.7.4
Refs sw17ch/data-clist#8

Not a full hackage update due to NixOS/cabal2nix#160
2015-04-12 12:45:30 -04:00
Shea Levy
fe4d221a30 ffmpeg-light: libavutil is part of ffmpeg.
Refs NixOS/cabal2nix#159
2015-04-11 14:24:02 -04:00
Peter Simons
34a8b2ee48 hackage-packages.nix: re-generate from Hackage 2015-04-08T15:53:57+0200 2015-04-08 21:00:03 +02:00
Peter Simons
d751367d70 haskell-gloss: keep old version around for GHC 7.8.x 2015-04-06 21:24:34 +02:00
Peter Simons
e3925a3478 hackage-packages.nix: re-generate from Hackage 2015-04-06T20:16:31+0200 2015-04-06 21:24:34 +02:00
Peter Simons
434f129c62 Agda: fix build by providing the required older versions of its dependencies
Resolves https://github.com/NixOS/nixpkgs/issues/7201.
2015-04-06 21:24:33 +02:00
Peter Simons
cb01f21063 hackage-packages.nix: re-generate from Hackage 2015-04-06T16:01:20+0200 2015-04-06 21:24:33 +02:00
Peter Simons
548dfdb832 cabal-install: add old 1.18.x version for the benefit of ghc-mod users
Install "haskellngPackages.cabal-install_1_18_0_8" to run ghc-mod with
GHC 7.8.x. Resolves https://github.com/NixOS/nixpkgs/issues/7133.
2015-04-02 22:59:05 +02:00
Peter Simons
847f25d03b hackage-packages.nix: enable a couple of builds that now succeed 2015-04-02 20:58:31 +02:00
Peter Simons
1afa8d28ea hackage-packages.nix: re-generate from Hackage 2015-04-01T12:39:25+0200 2015-04-01 22:54:45 +02:00
Peter Simons
d0ac04fbaa hackage-packages.nix: re-generate from Hackage 2015-03-31T16:39:41+0200 2015-03-31 22:04:43 +02:00
Peter Simons
6644bca846 idris: fix build by providing appropriate versions of the build inputs
Resolves https://github.com/NixOS/nixpkgs/issues/7014.
2015-03-31 13:56:16 +02:00
Peter Simons
179f1b788f hackage-packages.nix: downgrade blaze-html and haddock-library to fix Pandoc build 2015-03-30 16:43:56 +02:00
Peter Simons
6306f9a761 hackage-packages.nix: re-generate with recent hackage2nix 2015-03-30 16:43:55 +02:00
Peter Simons
d619392bdc hackage-packages.nix: don't update default version of 'primitive' yet 2015-03-30 16:43:55 +02:00
Peter Simons
e42e1ea6de hackage-packages.nix: re-generate from Hackage 2015-03-29T03:47:46+0200 2015-03-30 16:43:55 +02:00
Peter Simons
fa8c514407 hackage-packages.nix: re-generate from Hackage 2015-03-26T14:11:09+0100 2015-03-27 15:28:00 +01:00
Peter Simons
753284c2d0 hackage-packages.nix: add compiler-specific LLVM support
This change will resolve 'llvm' and related symbols from the compiler-specific
'llvmPackages' set rather than the global 'pkgs'. This allows us to use
different versions of llvm depending on the copmiler we're building with.
2015-03-26 11:29:06 +01:00
Peter Simons
2e811ff754 hackage-packages: re-generate from Hackage 2015-03-25T19:49:53+0100 2015-03-26 11:29:05 +01:00
Peter Simons
6792f76706 haskell-stm-queue-extras: manually remove the update to revision 1
That revision doesn't exist. What happened is that upstream uploaded a Cabal
file that says "x-revision: 1". Of course, the incorrect setting will come back
in as soon as we update hackage-packages.nix. Nonetheless, I'm opting for the
short-term solution here, hoping that upstream will remove the x-revision
header from Hackage soon'ish.

https://github.com/haskell/hackage-server/issues/337
2015-03-25 14:37:15 +01:00
Peter Simons
1fcac34d46 hackage-packages.nix: re-generate from Hackage 2015-03-24T20:22:17+0100 2015-03-25 14:37:15 +01:00
Peter Simons
013b12a54c haskell-ng: expose Hackage's revision number in hackage-packages.nix and use it to generate stable download URLs for edited Cabal files
Fixes https://github.com/NixOS/nixpkgs/issues/6914.
2015-03-25 14:37:15 +01:00
Peter Simons
3f0097fc4b hackage-packages.nix: re-generate from Hackage 2015-03-24T13:42:07+0100 2015-03-25 14:37:14 +01:00
Peter Simons
446f301078 hackage-packages: re-generate from Hackage 2015-03-20T11:29:46+0100 2015-03-21 19:44:12 +01:00
Peter Simons
afb0874e06 hackage-packages.nix: re-generate from Hackage 2015-03-19T13:39:37+0100 2015-03-19 17:55:19 +01:00
Peter Simons
3f45fe100a haskell-bindings-GLFW is broken (and has been for quite a while). 2015-03-18 13:31:33 +01:00
Peter Simons
5cdd855938 haskell-lens: update to 4.8 2015-03-18 13:31:33 +01:00
Peter Simons
25f4f78c92 haskell-mysql: fix build 2015-03-18 12:13:43 +01:00
Peter Simons
53fa11398c hackage-packages.nix: re-generate from Hackage 2015-03-17T11:52:35+0100 2015-03-18 12:13:43 +01:00
Peter Simons
42ab5ea077 hackage-packages: re-generate from Hackage 2015-03-16T12:54:30+0100 2015-03-16 12:54:30 +01:00
Peter Simons
62d8b22931 hackage-packages.nix: re-generate from Hackage 2015-03-15T11:02:07+0100 2015-03-16 12:52:13 +01:00
Peter Simons
9370137501 hackage-packages.nix: re-generate from Hackage 2015-03-14T14:55:25+0100 2015-03-15 11:00:12 +01:00
Peter Simons
1207bc606e hackage-packages.nix: re-generate from Hackage 2015-03-14T13:08:30+0100 2015-03-15 11:00:11 +01:00
Peter Simons
14e5333e3c hackage-packages: re-generate from Hackage 2015-03-12T12:28:02+0100
Resolves https://github.com/peti/jailbreak-cabal/issues/5.
2015-03-13 10:01:29 +01:00
Peter Simons
a05aa1a3b1 haskell-ng: update to latest hscolour 2015-03-09 16:37:43 +01:00
Peter Simons
025d063d45 hackage-packages: re-generate from Hackage 2015-03-08T10:54:07+0100 2015-03-09 15:20:58 +01:00
Peter Simons
d93b114bbe hackage-packages.nix: re-generate from Hackage 2015-03-07T13:02:15+0100 2015-03-07 17:09:40 +01:00
Peter Simons
5f736a02fb hackage-packages.nix: re-generate from Hackage 2015-03-06T11:14:49+0100 2015-03-06 16:23:46 +01:00
Peter Simons
4e6310ed17 hackage-packages: re-generate from Hackage 2015-03-05T17:55:09+0100 2015-03-05 18:29:55 +01:00
Peter Simons
16d8a67e75 hackage-packages: re-generate from Hackage 2015-03-04T18:28:23+0100 2015-03-04 18:28:23 +01:00
Peter Simons
1bc9c33f78 hackage-packages: re-generate from Hackage 2015-03-04T12:23:14+0100 2015-03-04 15:55:33 +01:00
Peter Simons
a07576ff4d haskell-poppler: fix reference to poppler-glib 2015-03-04 12:20:09 +01:00
Peter Simons
278bea4eda haskell-hsqml: fix build 2015-03-03 22:48:16 +01:00
Peter Simons
19f74eebd6 haskell-Xauth: fix reference to libXau system library 2015-03-03 22:48:16 +01:00
Peter Simons
b0b08abf31 hackage-packages.nix: re-generate from Hackage 2015-03-02T12:33:46+0100
Resolves https://github.com/NixOS/nixpkgs/issues/6622.
2015-03-03 22:48:16 +01:00
Peter Simons
cec683b791 hackage-packages: re-generate from Hackage 2015-02-25T21:27:32+0100 2015-02-26 11:34:14 +01:00
Peter Simons
2ce047165a hackage-packages.nix: re-generate from Hackage 2015-02-25T12:26:26+0100 2015-02-25 14:11:17 +01:00
Peter Simons
475097ace1 hackage-packages: re-generate from Hackage 2015-02-24T12:08:55+0100 2015-02-24 23:29:58 +01:00
Peter Simons
524e184c68 haskell-ng: fix crf-chain1-constrained and crf-chain2-tiers 2015-02-23 13:46:04 +01:00
Peter Simons
a88d2eeb3a hackage-packages.nix: re-generate from Hackage 2015-02-23T11:43:03+0100 2015-02-23 13:46:04 +01:00
Peter Simons
e8fbc94939 hackage-packages: re-generate from Hackage 2015-02-22T21:05:07+0100 2015-02-22 22:13:10 +01:00
Peter Simons
8e92c1fcbe haskell-descriptive: update to version 0.9.1 to fix build errors 2015-02-22 19:47:23 +01:00
Peter Simons
3cfa24338d haskell-QuickCheck: add support for version 1.x to fix various builds 2015-02-22 19:47:23 +01:00
Peter Simons
f28a690bed hackage-packages.nix: re-generate from Hackage 2015-02-22T13:31:37+0100 2015-02-22 19:47:22 +01:00
Peter Simons
862d224c69 haskell-wxc: fix build
Our 'wxGTK' attribute refers to wxwidgets 2.8 by default, but haskell-wxc needs
version 2.9 or later.

Resolves https://github.com/NixOS/nixpkgs/issues/6478.
2015-02-21 18:53:35 +01:00
Peter Simons
8051e87848 hackage-packages.nix: re-generate from Hackage 2015-02-20T13:19:54+0100 2015-02-21 18:53:34 +01:00
Peter Simons
0145793b92 hackage-packages.nix: re-generate from Hackage 2015-02-17T11:57:38+0100 2015-02-17 11:57:38 +01:00
Peter Simons
a2a87c9126 hackage-packages.nix: re-generate from Hackage 2015-02-16T09:28:28+0100 2015-02-16 09:28:28 +01:00
Peter Simons
8d737e3f0c hackage-packages: re-generate from Hackage 2015-02-15T20:03:28+0100 2015-02-15 22:35:28 +01:00
Peter Simons
1bb43ea027 hackage-packages.nix: re-generate from Hackage 2015-02-14T10:41:17+0100 2015-02-14 19:41:49 +01:00
Peter Simons
26faa326cd hackage-packages.nix: re-generate from Hackage 2015-02-13T12:48:35+0100 2015-02-13 22:24:32 +01:00