nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-23 06:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,198 Commits 191 Branches 125 Tags 8.4 GiB
fe4677de2f
Commit Graph

1636 Commits

Author SHA1 Message Date
Peter Simons
6975b032b1 haskell-persistent-template: updated to version 0.8.1.2 
svn path=/nixpkgs/trunk/; revision=32736
 2012-03-02 08:46:43 +00:00
Peter Simons
dc74dd0cb0 haskell-math-functions: updated to version 0.1.1.1 
svn path=/nixpkgs/trunk/; revision=32735
 2012-03-02 08:46:38 +00:00
Eelco Dolstra
11d1104a88 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
 2012-03-01 22:22:24 +00:00
Peter Simons
87f8280cc9 haskell-yesod: updated to version 0.10.1.3 
svn path=/nixpkgs/trunk/; revision=32725
 2012-03-01 20:19:46 +00:00
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
 2012-03-01 07:04:39 +00:00
Peter Simons
41b3f46f78 haskell-yesod: updated to version 0.10.1.1 
svn path=/nixpkgs/trunk/; revision=32710
 2012-02-29 20:38:33 +00:00
Peter Simons
49a9e39593 haskell-gitit: updated to version 0.9 
svn path=/nixpkgs/trunk/; revision=32709
 2012-02-29 19:24:49 +00:00
Peter Simons
d18d66bd5f haskell-filestore: updated to version 0.4.1 
svn path=/nixpkgs/trunk/; revision=32708
 2012-02-29 19:24:47 +00:00
Peter Simons
81e6c12bb3 haskell-IfElse: added version 0.85 
svn path=/nixpkgs/trunk/; revision=32707
 2012-02-29 19:24:44 +00:00
Peter Simons
a631f6de6a haskell-utility-ht: updated to version 0.0.8 
svn path=/nixpkgs/trunk/; revision=32706
 2012-02-29 17:30:52 +00:00
Peter Simons
4fc8cd9777 haskell-testpack: updated to version 2.1.2 
svn path=/nixpkgs/trunk/; revision=32705
 2012-02-29 17:30:49 +00:00
Peter Simons
3c88baeec8 haskell-convertible: updated to version 1.0.11.1 
svn path=/nixpkgs/trunk/; revision=32704
 2012-02-29 17:30:47 +00:00
Peter Simons
31dc88f597 haskell-clientsession: updated to version 0.7.4.1 
svn path=/nixpkgs/trunk/; revision=32703
 2012-02-29 17:30:44 +00:00
Peter Simons
43153fa269 haskell-authenticate: updated to version 1.0.0.1 
svn path=/nixpkgs/trunk/; revision=32702
 2012-02-29 17:30:42 +00:00
Peter Simons
708e6f487d haskell-HSH: updated to version 2.0.4 
svn path=/nixpkgs/trunk/; revision=32701
 2012-02-29 17:30:39 +00:00
Peter Simons
5f4c5c106a haskell-stm: updated to version 2.3 
svn path=/nixpkgs/trunk/; revision=32700
 2012-02-29 17:24:31 +00:00
Peter Simons
ad4b594cce haskell-hxt: updated to version 9.2.2 
svn path=/nixpkgs/trunk/; revision=32699
 2012-02-29 17:24:27 +00:00
Peter Simons
de9ebc460c Added meta.maintainers section. 
svn path=/nixpkgs/trunk/; revision=32669
 2012-02-28 00:10:09 +00:00
Peter Simons
bf4ebdc2bb haskell-HSH: shell scripting in haskell 
svn path=/nixpkgs/trunk/; revision=32666
 2012-02-28 00:09:59 +00:00
Peter Simons
9e371a98c2 haskell-base64-bytestring: downgraded default version to 0.1.0.3 
Michael Snoyman reports that version 0.1.1.0 has serious performance issues:

> import Data.ByteString.Base64
> import Data.ByteString.Char8 (pack)
> import Criterion.Main
>
> main :: IO ()
> main = defaultMain
>    [ bench "encode" $ whnf encode $ pack "qwerty"
>    ]

On version 0.1.0.3, this takes 229.4312 ns. On 0.1.1.0, it takes 3.556598 ms.
It looks like the problem is coming from the recent addition of URL encoding
(f1916d8a86).

svn path=/nixpkgs/trunk/; revision=32632
 2012-02-27 20:27:41 +00:00
Peter Simons
4c93fa4e47 haskell-persistent: updated to version 0.8.0.1 
svn path=/nixpkgs/trunk/; revision=32616
 2012-02-27 10:12:03 +00:00
Shea Levy
ea195b2507 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
 2012-02-25 19:57:34 +00:00
Peter Simons
7002f59751 haskell-warp: updated to version 1.1.0.1 
svn path=/nixpkgs/trunk/; revision=32543
 2012-02-24 11:38:59 +00:00
Peter Simons
c24800a05b haskell-wai: updated to version 1.1.0.1 
svn path=/nixpkgs/trunk/; revision=32542
 2012-02-24 11:38:57 +00:00
Peter Simons
557c02f29c haskell-wai-extra: updated to version 1.1.0.1 
svn path=/nixpkgs/trunk/; revision=32541
 2012-02-24 11:38:55 +00:00
Peter Simons
3eca3a2f17 haskell-wai-app-static: updated to version 1.1.2 
svn path=/nixpkgs/trunk/; revision=32540
 2012-02-24 11:38:52 +00:00
Peter Simons
4b3e14f5d0 Deleted deprecated packages: 
haskell-containers-deepseq
  haskell-control-monad-attempt
  haskell-data-object
  haskell-data-object-yaml
  haskell-frown
  haskell-jsonEnumerator
  haskell-neither
  haskell-pool
  haskell-web-routes
  haskell-web-routes-quasi
  haskell-xml-enumerator

svn path=/nixpkgs/trunk/; revision=32538
 2012-02-24 11:31:19 +00:00
Peter Simons
1df1758ca2 haskell-zlib-conduit: updated to version 0.2.0.1 
svn path=/nixpkgs/trunk/; revision=32537
 2012-02-24 11:31:16 +00:00
Peter Simons
e8ee9fa720 haskell-pandoc-types: updated to version 1.9.1 
svn path=/nixpkgs/trunk/; revision=32536
 2012-02-24 11:31:14 +00:00
Peter Simons
01efc84524 haskell-blaze-builder-conduit: updated to version 0.2.0.1 
svn path=/nixpkgs/trunk/; revision=32535
 2012-02-24 11:31:11 +00:00
Peter Simons
7c0fd3becc haskell-attoparsec-conduit: updated to version 0.2.0.1 
svn path=/nixpkgs/trunk/; revision=32534
 2012-02-24 11:31:08 +00:00
Peter Simons
9c06f2b68a haskell-monads-tf: added version 0.1.0.0 
svn path=/nixpkgs/trunk/; revision=32533
 2012-02-24 08:24:12 +00:00
Yury G. Kudryashov
38e3d7bc86 svn merge ^/nixpkgs/trunk 
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
 2012-02-23 20:06:21 +00:00
Peter Simons
222adc9fc3 haskell-funcmp: updated to version 1.6 
svn path=/nixpkgs/trunk/; revision=32514
 2012-02-23 16:08:57 +00:00
Peter Simons
5892f691dd haskell-cabal-file-th: updated to version 0.2.2 
svn path=/nixpkgs/trunk/; revision=32513
 2012-02-23 16:08:52 +00:00
Peter Simons
54939ca86c haskell-xml-conduit: updated to version 0.5.3 
svn path=/nixpkgs/trunk/; revision=32510
 2012-02-23 11:33:36 +00:00
Peter Simons
808df319a2 haskell-web-routes: updated to version 0.27.1 
svn path=/nixpkgs/trunk/; revision=32509
 2012-02-23 11:33:33 +00:00
Peter Simons
5232776a29 haskell-shakespeare-js: updated to version 0.11.1 
svn path=/nixpkgs/trunk/; revision=32508
 2012-02-23 11:33:31 +00:00
Peter Simons
be4b264bea haskell-shakespeare-css: updated to version 0.10.7.1 
svn path=/nixpkgs/trunk/; revision=32507
 2012-02-23 11:33:29 +00:00
Eelco Dolstra
e64443baf1 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
 2012-02-21 23:29:21 +00:00
Peter Simons
bbc7b11572 haskell-dimensional: updated to version 0.10.2 
svn path=/nixpkgs/trunk/; revision=32461
 2012-02-21 16:41:30 +00:00
Peter Simons
6c796fa539 haskell-yesod-core: updated to version 0.10.2.1 
svn path=/nixpkgs/trunk/; revision=32453
 2012-02-21 13:39:29 +00:00
Peter Simons
eac4153574 haskell-yesod-form: updated to version 0.4.2 
svn path=/nixpkgs/trunk/; revision=32448
 2012-02-21 10:07:12 +00:00
Peter Simons
8011875681 haskell-conduit: updated to version 0.2.2 
svn path=/nixpkgs/trunk/; revision=32447
 2012-02-21 10:07:10 +00:00
Peter Simons
9843a6f100 yesod-core: disable haddock phase in this version of the package to avoid build failures because of syntax errors in the documentation 
The bug has been reported upstream.

svn path=/nixpkgs/trunk/; revision=32446
 2012-02-21 10:07:08 +00:00
Peter Simons
19b43c8f42 haskell-yesod-core: updated to version 0.10.2 
svn path=/nixpkgs/trunk/; revision=32438
 2012-02-20 19:03:15 +00:00
Peter Simons
1dd8249087 haskell-hxt: updated to version 9.2.1 
svn path=/nixpkgs/trunk/; revision=32437
 2012-02-20 19:03:12 +00:00
Peter Simons
d2ef3f937c haskell-happstack-server: updated to version 6.6.3 
svn path=/nixpkgs/trunk/; revision=32421
 2012-02-20 10:45:00 +00:00
Peter Simons
2fc61e1010 haskell-smallcheck: updated to version 0.6.1 
svn path=/nixpkgs/trunk/; revision=32420
 2012-02-20 10:44:57 +00:00
Peter Simons
037eafa2cf haskell-fclabels: updated to version 1.1.1.0 
svn path=/nixpkgs/trunk/; revision=32419
 2012-02-20 10:44:53 +00:00
Peter Simons
6e9ecace50 haskell-SDL: updated to version 0.6.3 
svn path=/nixpkgs/trunk/; revision=32418
 2012-02-20 10:44:49 +00:00
Yury G. Kudryashov
d8454e538c svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32417
 2012-02-20 05:30:06 +00:00
Peter Simons
cecff49b34 Moved the cabal build driver function from development/libraries/haskell/cabal to build-support/cabal. 
This change also resolves the "cabal" vs. "Cabal" ambiguity on file systems
that don't distinguish case.

svn path=/nixpkgs/trunk/; revision=32401
 2012-02-19 17:03:35 +00:00
Yury G. Kudryashov
313a029f16 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
 2012-02-19 11:16:24 +00:00
Peter Simons
d27f8787f7 haskell-http-date: updated to version 0.0.2 
svn path=/nixpkgs/trunk/; revision=32351
 2012-02-17 14:02:01 +00:00
Yury G. Kudryashov
79d0d410cb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
 2012-02-17 13:43:31 +00:00
Peter Simons
e76f971db6 haskell-happstack-hamlet: updated to version 6.2.4 
svn path=/nixpkgs/trunk/; revision=32331
 2012-02-16 17:47:59 +00:00
Yury G. Kudryashov
e5027e5b36 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
 2012-02-16 15:02:26 +00:00
Peter Simons
cb28766341 Re-generated Haskell package descriptions with the latest version of cabal2nix. 
svn path=/nixpkgs/trunk/; revision=32327
 2012-02-16 14:05:41 +00:00
Peter Simons
b7e432214b haskell-packages.nix: improved handling of 'Cabal' 
Most packages use the Cabal library only as a build tool, and as such it is a
dependency of the cabal.nix builder -- not of the package that's being built
with that builder.

svn path=/nixpkgs/trunk/; revision=32326
 2012-02-16 14:05:01 +00:00
Peter Simons
0fea240440 haskell-alternative-io: added meta.maintainers section 
svn path=/nixpkgs/trunk/; revision=32318
 2012-02-16 09:05:47 +00:00
Peter Simons
3b0b922884 haskell-uniplate: updated to version 1.6.6 
svn path=/nixpkgs/trunk/; revision=32317
 2012-02-16 09:05:45 +00:00
Peter Simons
62757d7b36 haskell-simple-sendfile: updated to version 0.2.1 
svn path=/nixpkgs/trunk/; revision=32316
 2012-02-16 09:05:43 +00:00
Peter Simons
40919ea624 haskell-pandoc: updated to version 1.9.1.1 
svn path=/nixpkgs/trunk/; revision=32315
 2012-02-16 09:05:40 +00:00
Peter Simons
f0584f1367 haskell-language-javascript: updated to version 0.4.9 
svn path=/nixpkgs/trunk/; revision=32314
 2012-02-16 09:05:38 +00:00
Peter Simons
f76039e1e0 haskell-hmatrix: updated to version 0.13.1.0 
svn path=/nixpkgs/trunk/; revision=32313
 2012-02-16 09:05:35 +00:00
Peter Simons
61175b2026 haskell-haskell-src-meta: updated to version 0.5.1 
svn path=/nixpkgs/trunk/; revision=32312
 2012-02-16 09:05:33 +00:00
Peter Simons
3d85ce1843 haskell-crypto-pubkey-types: updated to version 0.1.1 
svn path=/nixpkgs/trunk/; revision=32311
 2012-02-16 09:05:27 +00:00
Peter Simons
26d8fc0ca1 haskell-language-javascript: updated to version 0.4.8 
svn path=/nixpkgs/trunk/; revision=32297
 2012-02-15 10:39:20 +00:00
Peter Simons
2df2202804 haskell-highlighting-kate: updated to version 0.5.0.5 
svn path=/nixpkgs/trunk/; revision=32296
 2012-02-15 10:39:18 +00:00
Peter Simons
c37d8c5f90 haskell-hashable: updated to version 1.1.2.3 
svn path=/nixpkgs/trunk/; revision=32295
 2012-02-15 10:39:15 +00:00
Peter Simons
9882d962d1 haskell-alternative-io: added version 0.0.0 
svn path=/nixpkgs/trunk/; revision=32294
 2012-02-15 10:39:09 +00:00
Peter Simons
ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix. 
svn path=/nixpkgs/trunk/; revision=32292
 2012-02-14 17:00:37 +00:00
Peter Simons
3256e7f5c2 haskell-nixos-types: removed obsolete package 
svn path=/nixpkgs/trunk/; revision=32290
 2012-02-14 16:59:01 +00:00
Peter Simons
adc9bf0510 haskell-packages.nix: removed obsolete 'aeson-native' and 'blaze-textual-native' 
svn path=/nixpkgs/trunk/; revision=32289
 2012-02-14 16:58:58 +00:00
Peter Simons
89a958e4d0 haskell-packages.nix: allow packages to be built with a version of 'Cabal' other than the one shipped with the compiler 
svn path=/nixpkgs/trunk/; revision=32288
 2012-02-14 16:58:56 +00:00
Peter Simons
5cbc5242a8 haskell-wai-logger: updated to version 0.1.4 
svn path=/nixpkgs/trunk/; revision=32286
 2012-02-14 16:58:51 +00:00
Peter Simons
f2ee9177d0 haskell-stb-image: updated to version 0.2.1 
svn path=/nixpkgs/trunk/; revision=32285
 2012-02-14 16:58:48 +00:00
Peter Simons
e6f6c4b42e haskell-shakespeare-i18n: updated to version 0.0.2 
svn path=/nixpkgs/trunk/; revision=32284
 2012-02-14 16:58:46 +00:00
Peter Simons
75da6dea33 haskell-libmpd: updated to version 0.7.2 
svn path=/nixpkgs/trunk/; revision=32283
 2012-02-14 16:58:43 +00:00
Peter Simons
19be3645ad haskell-http-types: updated to version 0.6.9 
svn path=/nixpkgs/trunk/; revision=32282
 2012-02-14 16:58:41 +00:00
Peter Simons
385e002338 haskell-hakyll: updated to version 3.2.6.1 
svn path=/nixpkgs/trunk/; revision=32281
 2012-02-14 16:58:38 +00:00
Peter Simons
1bc51d7448 haskell-hackage-db: updated to version 1.3 
svn path=/nixpkgs/trunk/; revision=32280
 2012-02-14 16:58:35 +00:00
Peter Simons
9c1bdb6d90 haskell-ghc-mod: updated to version 1.10.5 
svn path=/nixpkgs/trunk/; revision=32279
 2012-02-14 16:58:33 +00:00
Peter Simons
70d973551a haskell-bitmap: updated to version 0.0.2 
svn path=/nixpkgs/trunk/; revision=32278
 2012-02-14 16:58:30 +00:00
Peter Simons
f1abe7d195 haskell-network: updated 2.3.x version to 2.3.0.11 
svn path=/nixpkgs/trunk/; revision=32276
 2012-02-14 16:58:24 +00:00
Yury G. Kudryashov
f7886ac78b svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
 2012-02-13 19:47:36 +00:00
Peter Simons
32c4436335 haskell-yesod-routes: added meta.maintainers 
svn path=/nixpkgs/trunk/; revision=32253
 2012-02-13 09:02:26 +00:00
Peter Simons
bf4edd50de haskell-yesod-auth: updated to version 0.8.1.1 
svn path=/nixpkgs/trunk/; revision=32252
 2012-02-13 09:02:23 +00:00
Peter Simons
3a381fbe8b haskell-wai-logger: updated to version 0.1.3 
svn path=/nixpkgs/trunk/; revision=32251
 2012-02-13 09:02:21 +00:00
Peter Simons
26dc512856 haskell-texmath: updated to version 0.6.0.3 
svn path=/nixpkgs/trunk/; revision=32250
 2012-02-13 09:02:19 +00:00
Peter Simons
f8bdfa5b7f haskell-system-fileio: updated to version 0.3.5 
svn path=/nixpkgs/trunk/; revision=32249
 2012-02-13 09:02:16 +00:00
Peter Simons
76c27de286 haskell-persistent-template: updated to version 0.8.1.1 
svn path=/nixpkgs/trunk/; revision=32248
 2012-02-13 09:02:14 +00:00
Peter Simons
e01f4fb894 haskell-pandoc: updated to version 1.9.1.1 
svn path=/nixpkgs/trunk/; revision=32247
 2012-02-13 09:02:11 +00:00
Peter Simons
3cc92a77ce haskell-numeric-prelude: updated to version 0.3.0.1 
svn path=/nixpkgs/trunk/; revision=32246
 2012-02-13 09:02:08 +00:00
Peter Simons
7c6a291d49 haskell-http-conduit: updated to version 1.2.6 
svn path=/nixpkgs/trunk/; revision=32245
 2012-02-13 09:02:06 +00:00
Peter Simons
1f346f4781 haskell-highlighting-kate: updated to version 0.5.0.4 
svn path=/nixpkgs/trunk/; revision=32244
 2012-02-13 09:02:04 +00:00
Peter Simons
b6922cc2ae haskell-crypto-conduit: updated to version 0.1.3.1 
svn path=/nixpkgs/trunk/; revision=32243
 2012-02-13 09:02:01 +00:00
Peter Simons
a05bc7570c haskell-conduit: updated to version 0.2.1 
svn path=/nixpkgs/trunk/; revision=32242
 2012-02-13 09:01:59 +00:00
Peter Simons
af4959a2ae haskell-cmdargs: updated to version 0.9.3 
svn path=/nixpkgs/trunk/; revision=32241
 2012-02-13 09:01:56 +00:00
Peter Simons
e74e8f880a haskell-attoparsec: updated to version 0.10.1.1 
svn path=/nixpkgs/trunk/; revision=32240
 2012-02-13 09:01:54 +00:00
Peter Simons
7d51d52499 haskell-HDBC: updated to version 2.3.1.1 
svn path=/nixpkgs/trunk/; revision=32239
 2012-02-13 09:01:51 +00:00
Yury G. Kudryashov
fc21cca549 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32231
 2012-02-12 09:33:54 +00:00
Peter Simons
657628e1c7 haskell-zlib-conduit: updated to version 0.2.0 
svn path=/nixpkgs/trunk/; revision=32213
 2012-02-10 11:34:23 +00:00
Peter Simons
eef5c55e6e haskell-yesod: updated to version 0.10.1 
svn path=/nixpkgs/trunk/; revision=32212
 2012-02-10 11:34:20 +00:00
Peter Simons
4b7ebbed6f haskell-yesod-static: updated to version 0.10.1 
svn path=/nixpkgs/trunk/; revision=32211
 2012-02-10 11:34:18 +00:00
Peter Simons
a5461d2cc8 haskell-yesod-persistent: updated to version 0.3.1 
svn path=/nixpkgs/trunk/; revision=32210
 2012-02-10 11:34:15 +00:00
Peter Simons
8478697f71 haskell-yesod-json: updated to version 0.3.1 
svn path=/nixpkgs/trunk/; revision=32209
 2012-02-10 11:34:12 +00:00
Peter Simons
76dbef631e haskell-yesod-form: updated to version 0.4.1 
svn path=/nixpkgs/trunk/; revision=32208
 2012-02-10 11:34:09 +00:00
Peter Simons
ca95e7796c haskell-yesod-default: updated to version 0.6.1 
svn path=/nixpkgs/trunk/; revision=32207
 2012-02-10 11:34:06 +00:00
Peter Simons
bb1679d371 haskell-yesod-core: updated to version 0.10.1 
svn path=/nixpkgs/trunk/; revision=32206
 2012-02-10 11:34:04 +00:00
Peter Simons
6caa6272e9 haskell-yesod-auth: updated to version 0.8.1 
svn path=/nixpkgs/trunk/; revision=32205
 2012-02-10 11:34:01 +00:00
Peter Simons
6d1c0f4b60 haskell-yaml: updated to version 0.5.2 
svn path=/nixpkgs/trunk/; revision=32204
 2012-02-10 11:33:58 +00:00
Peter Simons
897d63e5f7 haskell-warp: updated to version 1.1.0 
svn path=/nixpkgs/trunk/; revision=32203
 2012-02-10 11:33:56 +00:00
Peter Simons
85c395797e haskell-wai: updated to version 1.1.0 
svn path=/nixpkgs/trunk/; revision=32202
 2012-02-10 11:33:52 +00:00
Peter Simons
57cb4ab024 haskell-wai-extra: updated to version 1.1.0 
svn path=/nixpkgs/trunk/; revision=32201
 2012-02-10 11:33:50 +00:00
Peter Simons
f7200279f4 haskell-wai-app-static: updated to version 1.1.1 
svn path=/nixpkgs/trunk/; revision=32200
 2012-02-10 11:33:47 +00:00
Peter Simons
acfc1c505e haskell-tls: updated to version 0.9.0 
svn path=/nixpkgs/trunk/; revision=32199
 2012-02-10 11:33:44 +00:00
Peter Simons
7750208983 haskell-tls-extra: updated to version 0.4.3 
svn path=/nixpkgs/trunk/; revision=32198
 2012-02-10 11:33:42 +00:00
Peter Simons
5f3751c931 haskell-th-lift: updated to version 0.5.5 
svn path=/nixpkgs/trunk/; revision=32197
 2012-02-10 11:33:39 +00:00
Peter Simons
d4cde49783 haskell-shakespeare: updated to version 0.10.3.1 
svn path=/nixpkgs/trunk/; revision=32196
 2012-02-10 11:33:36 +00:00
Peter Simons
067ed3e52b haskell-shakespeare-text: updated to version 0.10.5 
svn path=/nixpkgs/trunk/; revision=32195
 2012-02-10 11:33:34 +00:00
Peter Simons
b1dabf4795 haskell-shakespeare-js: updated to version 0.11.0.1 
svn path=/nixpkgs/trunk/; revision=32194
 2012-02-10 11:33:31 +00:00
Peter Simons
58a133f7fb haskell-shakespeare-i18n: updated to version 0.0.1 
svn path=/nixpkgs/trunk/; revision=32193
 2012-02-10 11:33:28 +00:00
Peter Simons
7d474b4dd9 haskell-shakespeare-css: updated to version 0.10.7 
svn path=/nixpkgs/trunk/; revision=32192
 2012-02-10 11:33:26 +00:00
Peter Simons
a53f8656fe haskell-pandoc: updated to version 1.9.1 
svn path=/nixpkgs/trunk/; revision=32191
 2012-02-10 11:33:23 +00:00
Peter Simons
baeebd7677 haskell-http-enumerator: updated to version 0.7.3 
svn path=/nixpkgs/trunk/; revision=32190
 2012-02-10 11:33:20 +00:00
Peter Simons
7d6092cbbc haskell-http-conduit: updated to version 1.2.5 
svn path=/nixpkgs/trunk/; revision=32189
 2012-02-10 11:33:18 +00:00
Peter Simons
da120789ce haskell-highlighting-kate: updated to version 0.5.0.2 
svn path=/nixpkgs/trunk/; revision=32188
 2012-02-10 11:33:15 +00:00
Peter Simons
2a0c2cccdb haskell-cookie: updated to version 0.4.0 
svn path=/nixpkgs/trunk/; revision=32187
 2012-02-10 11:33:13 +00:00
Peter Simons
4d74352a73 haskell-conduit: updated to version 0.2.0 
svn path=/nixpkgs/trunk/; revision=32186
 2012-02-10 11:33:10 +00:00
Peter Simons
df2916a86a haskell-certificate: updated to version 1.1.0 
svn path=/nixpkgs/trunk/; revision=32185
 2012-02-10 11:33:07 +00:00
Peter Simons
081a06c578 haskell-blaze-builder-conduit: updated to version 0.2.0 
svn path=/nixpkgs/trunk/; revision=32184
 2012-02-10 11:33:05 +00:00
Peter Simons
3dd1ac8766 haskell-authenticate: updated to version 1.0.0 
svn path=/nixpkgs/trunk/; revision=32183
 2012-02-10 11:33:02 +00:00
Peter Simons
a72543aa72 haskell-attoparsec-conduit: updated to version 0.2.0 
svn path=/nixpkgs/trunk/; revision=32182
 2012-02-10 11:32:59 +00:00
Peter Simons
c78b13be70 haskell-persistent-template: updated to version 0.8.1 
svn path=/nixpkgs/trunk/; revision=32181
 2012-02-10 11:32:57 +00:00
Peter Simons
27b9910634 haskell-persistent-sqlite: updated to version 0.8.0 
svn path=/nixpkgs/trunk/; revision=32180
 2012-02-10 11:32:54 +00:00
Peter Simons
a2d2fa31a6 haskell-persistent: updated to version 0.8.0 
svn path=/nixpkgs/trunk/; revision=32179
 2012-02-10 11:32:50 +00:00
Peter Simons
78d758d93f haskell-yesod-routes: added version 0.0.1 
svn path=/nixpkgs/trunk/; revision=32178
 2012-02-10 11:32:48 +00:00
Peter Simons
cd306852ad haskell-crypto-conduit: added version 0.1.3.1 
svn path=/nixpkgs/trunk/; revision=32177
 2012-02-10 11:32:45 +00:00
Peter Simons
eb9badcd21 haskell-attempt: added version 0.4.0 
svn path=/nixpkgs/trunk/; revision=32176
 2012-02-10 11:32:40 +00:00
Peter Simons
cf686eaa50 haskell-failure: added version 0.2.0 
svn path=/nixpkgs/trunk/; revision=32175
 2012-02-10 11:32:35 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk 
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
 2012-02-10 10:24:30 +00:00
Peter Simons
1e8e60da41 haskell-json: fix build with GHC 7.4.x 
svn path=/nixpkgs/trunk/; revision=32162
 2012-02-09 14:38:03 +00:00
Peter Simons
24ff52e62e haskell-json: dropped obsolete version 0.4.4 
svn path=/nixpkgs/trunk/; revision=32161
 2012-02-09 14:38:01 +00:00
Peter Simons
db29c078b3 haskell-texmath: updated to version 0.6.0.2 
svn path=/nixpkgs/trunk/; revision=32157
 2012-02-09 12:54:05 +00:00
Peter Simons
4ef705c1ef haskell-haxr: updated to version 3000.8.5 
svn path=/nixpkgs/trunk/; revision=32156
 2012-02-09 12:54:03 +00:00
Peter Simons
0333114f58 haskell-happstack-data: updated to version 6.0.1 
svn path=/nixpkgs/trunk/; revision=32155
 2012-02-09 12:54:00 +00:00
Peter Simons
d2bbefa08e haskell-hint: updated to version 0.3.3.4 
svn path=/nixpkgs/trunk/; revision=32148
 2012-02-08 23:06:01 +00:00
Peter Simons
6a46fac659 haskell-zlib-bindings: updated to version 0.0.3.2 
svn path=/nixpkgs/trunk/; revision=32140
 2012-02-08 09:22:40 +00:00
Peter Simons
115ec41ba1 haskell-libmpd: updated to version 0.7.1 
svn path=/nixpkgs/trunk/; revision=32139
 2012-02-08 09:22:38 +00:00
Peter Simons
8be0696c79 haskell-hamlet: updated to version 0.10.8 
svn path=/nixpkgs/trunk/; revision=32138
 2012-02-08 09:22:35 +00:00
Peter Simons
efd8bf8677 haskell-gloss: updated to version 1.6.1.1 
svn path=/nixpkgs/trunk/; revision=32137
 2012-02-08 09:22:32 +00:00
Peter Simons
07bf4c6f76 haskell-asn1-data: updated to version 0.6.1.3 
svn path=/nixpkgs/trunk/; revision=32136
 2012-02-08 09:22:28 +00:00
Peter Simons
77f1415102 haskell-wxdirect: updated to version 0.13.1.2 
svn path=/nixpkgs/trunk/; revision=32106
 2012-02-07 10:34:40 +00:00
Peter Simons
a3cab4b496 haskell-wxcore: updated to version 0.13.2.1 
svn path=/nixpkgs/trunk/; revision=32105
 2012-02-07 10:34:38 +00:00
Peter Simons
99e9375631 haskell-wx: updated to version 0.13.2.1 
svn path=/nixpkgs/trunk/; revision=32104
 2012-02-07 10:34:35 +00:00
Peter Simons
572260e237 haskell-system-filepath: updated to version 0.4.6 
svn path=/nixpkgs/trunk/; revision=32103
 2012-02-07 10:34:33 +00:00
Peter Simons
d5d4995b03 haskell-pandoc: updated to version 1.9.0.5 
svn path=/nixpkgs/trunk/; revision=32102
 2012-02-07 10:34:30 +00:00
Peter Simons
a2df0e09ff haskell-zlib: added version 0.5.3.3 
svn path=/nixpkgs/trunk/; revision=32101
 2012-02-07 10:34:28 +00:00
Peter Simons
6704a7379b haskell-test-framework: dropped version 0.4.2.2 
Pandoc updated to 0.5.

svn path=/nixpkgs/trunk/; revision=32100
 2012-02-07 10:34:25 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk 
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
 2012-02-06 23:03:12 +00:00
Peter Simons
1b85da5ae3 ghc-mod: upgraded to 1.0.8 
svn path=/nixpkgs/trunk/; revision=32077
 2012-02-06 19:08:48 +00:00
Peter Simons
fd12c85a33 haskell-hakyll: updated to version 3.2.6.0 
svn path=/nixpkgs/trunk/; revision=32075
 2012-02-06 18:28:22 +00:00
Peter Simons
bb5f77cfaa haskell-pandoc: updated to version 1.9.0.3 
svn path=/nixpkgs/trunk/; revision=32074
 2012-02-06 18:28:19 +00:00
Peter Simons
efa830e5c4 haskell-temporary: updated meta section 
svn path=/nixpkgs/trunk/; revision=32073
 2012-02-06 18:28:16 +00:00
Peter Simons
14e803ff8a haskell-test-framework: added version 0.4.2.2 (required by pandoc) 
svn path=/nixpkgs/trunk/; revision=32072
 2012-02-06 18:28:12 +00:00
Peter Simons
ad07ce6e67 haskell-vector-algorithms: updated to version 0.5.4 
svn path=/nixpkgs/trunk/; revision=32068
 2012-02-06 14:27:59 +00:00
Peter Simons
066cd10d99 haskell-texmath: updated to version 0.6.0.1 
svn path=/nixpkgs/trunk/; revision=32067
 2012-02-06 14:27:57 +00:00
Peter Simons
9a2922dec5 haskell-system-filepath: updated to version 0.4.5 
svn path=/nixpkgs/trunk/; revision=32066
 2012-02-06 14:27:54 +00:00
Peter Simons
84bfd464d0 haskell-system-fileio: updated to version 0.3.4 
svn path=/nixpkgs/trunk/; revision=32065
 2012-02-06 14:27:52 +00:00
Peter Simons
1eb5674ebf haskell-parsimony: updated to version 1.3 
svn path=/nixpkgs/trunk/; revision=32064
 2012-02-06 14:27:49 +00:00
Peter Simons
f11b58a1b1 haskell-pandoc: updated to version 1.9.0.2 
svn path=/nixpkgs/trunk/; revision=32063
 2012-02-06 14:27:47 +00:00
Peter Simons
6b7de9b5fc haskell-pandoc-types: updated to version 1.9.0.2 
svn path=/nixpkgs/trunk/; revision=32062
 2012-02-06 14:27:44 +00:00
Peter Simons
9cacf79ac0 haskell-highlighting-kate: updated to version 0.5.0.1 
svn path=/nixpkgs/trunk/; revision=32061
 2012-02-06 14:27:42 +00:00
Peter Simons
84a2bcfb26 haskell-OpenGLRaw: updated to version 1.2.0.0 
svn path=/nixpkgs/trunk/; revision=32060
 2012-02-06 14:27:40 +00:00
Peter Simons
a1cd71b5af haskell-HaskellForMaths: updated to version 0.4.3 
svn path=/nixpkgs/trunk/; revision=32059
 2012-02-06 14:27:37 +00:00
Peter Simons
eb53508829 haskell-Graphalyze: updated to version 0.12.0.0 
svn path=/nixpkgs/trunk/; revision=32058
 2012-02-06 14:27:35 +00:00
Peter Simons
6494e9a2c4 haskell-GLURaw: updated to version 1.2.0.0 
svn path=/nixpkgs/trunk/; revision=32057
 2012-02-06 14:27:32 +00:00
Peter Simons
c682f95d63 haskell-temporary: added version 1.1.2.3 
svn path=/nixpkgs/trunk/; revision=32056
 2012-02-06 14:27:30 +00:00
Peter Simons
269b4776ce haskell: added OpenGL 5.0.0 and GLUT 2.3.0.0 
svn path=/nixpkgs/trunk/; revision=32054
 2012-02-06 14:27:24 +00:00
Peter Simons
df0f103e86 haskell-http-conduit: downgrade to version 1.2.0 
The latest version has requirements version that we cannot fulfill
without duplicating a lot of packages.

svn path=/nixpkgs/trunk/; revision=32053
 2012-02-06 14:27:21 +00:00
Peter Simons
ce1ce28f96 haskell-yap: updated to version 0.2 
svn path=/nixpkgs/trunk/; revision=32026
 2012-02-04 08:38:09 +00:00
Peter Simons
49009f72ce haskell-hakyll: updated to version 3.2.5.1 
svn path=/nixpkgs/trunk/; revision=32025
 2012-02-04 08:38:04 +00:00
Peter Simons
038a3e5b2e haskell-vty: updated to version 4.7.0.10 
svn path=/nixpkgs/trunk/; revision=32020
 2012-02-03 21:00:30 +00:00
Peter Simons
56230f309e haskell-nixos-types: updated to version 1.3 
svn path=/nixpkgs/trunk/; revision=32019
 2012-02-03 21:00:27 +00:00
Peter Simons
88f110cb75 haskell-ieee754: updated to version 0.7.3 
svn path=/nixpkgs/trunk/; revision=32018
 2012-02-03 21:00:24 +00:00
Peter Simons
c77c727641 haskell-hackage-db: updated to version 1.2 
svn path=/nixpkgs/trunk/; revision=32017
 2012-02-03 21:00:21 +00:00
Peter Simons
2a10a4d967 haskell-bytestring-lexing: updated to version 0.4.0 
svn path=/nixpkgs/trunk/; revision=32016
 2012-02-03 21:00:18 +00:00
Peter Simons
875b61eeb9 haskell-cabal-file-th: patch cabal file to fix build with GHC 7.4.1 
svn path=/nixpkgs/trunk/; revision=32010
 2012-02-03 19:10:14 +00:00
Peter Simons
83c6e41b15 haskell-xhtml: added version 3000.2.0.5 
svn path=/nixpkgs/trunk/; revision=32008
 2012-02-03 19:06:47 +00:00
Peter Simons
dd28867e4f haskell-network: added version 2.3.0.10 
svn path=/nixpkgs/trunk/; revision=32007
 2012-02-03 19:06:44 +00:00
Peter Simons
351627cb88 haskell-extensible-exceptions: added version 0.1.1.4 
svn path=/nixpkgs/trunk/; revision=32006
 2012-02-03 19:06:41 +00:00
Peter Simons
49ca209cd2 haskell-deepseq: added version 1.3.0.0 
svn path=/nixpkgs/trunk/; revision=32005
 2012-02-03 19:06:38 +00:00
Peter Simons
8cba75ac34 haskell-ieee754: added version 0.7.3 
svn path=/nixpkgs/trunk/; revision=32004
 2012-02-03 19:06:35 +00:00
Peter Simons
4d25e699a1 haskell-socks: updated to version 0.4.1 
svn path=/nixpkgs/trunk/; revision=32003
 2012-02-03 19:06:32 +00:00
Peter Simons
f7889c850c haskell-language-javascript: updated to version 0.4.7 
svn path=/nixpkgs/trunk/; revision=32002
 2012-02-03 19:06:29 +00:00
Peter Simons
d9546f6165 haskell-http-conduit: updated to version 1.2.3 
svn path=/nixpkgs/trunk/; revision=32001
 2012-02-03 19:06:26 +00:00
Peter Simons
77625e49e5 haskell-hjsmin: updated to version 0.0.15 
svn path=/nixpkgs/trunk/; revision=32000
 2012-02-03 19:06:23 +00:00
Peter Simons
65ad5c83ef haskell-hastache: updated to version 0.3.3 
svn path=/nixpkgs/trunk/; revision=31999
 2012-02-03 19:06:20 +00:00
Peter Simons
7851600fcf haskell-filepath: updated to version 1.3.0.0 
svn path=/nixpkgs/trunk/; revision=31998
 2012-02-03 19:06:18 +00:00
Peter Simons
51d6cf8c90 haskell-binary: updated to version 0.5.1.0 
svn path=/nixpkgs/trunk/; revision=31997
 2012-02-03 19:06:15 +00:00
Andres Löh
f2d6ca5d02 Added haskell-{bitarray,containers-deepseq,gd}. 
svn path=/nixpkgs/trunk/; revision=31991
 2012-02-03 12:15:00 +00:00
Peter Simons
798890b819 haskell-zlib: drop version 0.5.3.2 again; it's causing lots of trouble 
This change affects only GHC 7.2 or later.

svn path=/nixpkgs/trunk/; revision=31985
 2012-02-02 17:03:01 +00:00
Peter Simons
bd2c29d553 haskell-persistent-sqlite: added version 0.6.2.1 
svn path=/nixpkgs/trunk/; revision=31983
 2012-02-02 14:54:56 +00:00
Peter Simons
e11c942238 haskell-yesod-default: added version 0.5.0 
svn path=/nixpkgs/trunk/; revision=31982
 2012-02-02 14:54:53 +00:00
Peter Simons
0ff6866501 haskell-crypto-api: updated to version 0.9 
svn path=/nixpkgs/trunk/; revision=31981
 2012-02-02 13:33:58 +00:00
Peter Simons
57c1279ce8 haskell-clientsession: updated to version 0.7.4 
svn path=/nixpkgs/trunk/; revision=31980
 2012-02-02 13:33:54 +00:00
Peter Simons
0f5ff15cb9 haskell-http-conduit: updated to version 1.2.0 
svn path=/nixpkgs/trunk/; revision=31977
 2012-02-02 10:52:15 +00:00
Peter Simons
c9a9d81471 haskell-conduit: updated to version 0.1.1.1 
svn path=/nixpkgs/trunk/; revision=31976
 2012-02-02 10:52:12 +00:00
Peter Simons
9aae354adf haskell-zlib-bindings: updated to version 0.0.3.1 
svn path=/nixpkgs/trunk/; revision=31974
 2012-02-02 10:38:06 +00:00
Peter Simons
de4350af7d haskell-test-framework: updated to version 0.5 
svn path=/nixpkgs/trunk/; revision=31973
 2012-02-02 10:38:03 +00:00
Peter Simons
36f7262ef3 haskell-socks: updated to version 0.4.0 
svn path=/nixpkgs/trunk/; revision=31972
 2012-02-02 10:38:01 +00:00
Peter Simons
3170847b13 haskell-hledger: updated to version 0.17 
svn path=/nixpkgs/trunk/; revision=31971
 2012-02-02 10:37:58 +00:00
Peter Simons
c7f15bf35e haskell-hledger-web: updated to version 0.17 
svn path=/nixpkgs/trunk/; revision=31970
 2012-02-02 10:37:56 +00:00
Peter Simons
a4eebff1d2 haskell-hledger-lib: updated to version 0.17 
svn path=/nixpkgs/trunk/; revision=31969
 2012-02-02 10:37:53 +00:00
Peter Simons
02ef8dd73f haskell-citeproc-hs: updated to version 0.3.4 
svn path=/nixpkgs/trunk/; revision=31968
 2012-02-02 10:37:51 +00:00
Peter Simons
8c1822d2d8 haskell-socks: added version 0.4.0 
svn path=/nixpkgs/trunk/; revision=31967
 2012-02-02 10:37:48 +00:00
Peter Simons
d7b739d9a5 haskell-cmdargs: deleted obsolete 0.8 version 
svn path=/nixpkgs/trunk/; revision=31966
 2012-02-02 10:37:45 +00:00
Peter Simons
eeeab81863 haskell-xml-conduit: updated to version 0.5.2 
svn path=/nixpkgs/trunk/; revision=31955
 2012-02-01 10:40:07 +00:00
Peter Simons
ea46f84a54 haskell-web-routes: updated to version 0.26.3 
svn path=/nixpkgs/trunk/; revision=31954
 2012-02-01 10:40:04 +00:00
Peter Simons
128f2e48d1 haskell-skein: updated to version 0.1.0.5 
svn path=/nixpkgs/trunk/; revision=31953
 2012-02-01 10:40:02 +00:00
Peter Simons
349b073889 haskell-pool-conduit: updated to version 0.0.0.1 
svn path=/nixpkgs/trunk/; revision=31952
 2012-02-01 10:39:59 +00:00
Peter Simons
17fefff71d haskell-happstack-util: updated to version 6.0.3 
svn path=/nixpkgs/trunk/; revision=31951
 2012-02-01 10:39:57 +00:00
Peter Simons
8347954f58 haskell-fast-logger: updated to version 0.0.2 
svn path=/nixpkgs/trunk/; revision=31950
 2012-02-01 10:39:54 +00:00
Peter Simons
690be29797 haskell-data-object-yaml: updated to version 0.3.4.2 
svn path=/nixpkgs/trunk/; revision=31949
 2012-02-01 10:39:50 +00:00
Peter Simons
3f5dc79546 haskell-string-combinators: updated to version 0.6.0.3 
svn path=/nixpkgs/trunk/; revision=31942
 2012-01-31 12:13:28 +00:00
Peter Simons
3dfbf75fff haskell-hmatrix: updated to version 0.13.1.0 
svn path=/nixpkgs/trunk/; revision=31941
 2012-01-31 12:13:26 +00:00
Peter Simons
325f8d0b28 haskell-email-validate: updated to version 0.2.8 
svn path=/nixpkgs/trunk/; revision=31940
 2012-01-31 12:13:22 +00:00
Peter Simons
b24279ff39 haskell-hledger-chart: updated to version 0.16.1 
svn path=/nixpkgs/trunk/; revision=31931
 2012-01-30 10:52:10 +00:00
Peter Simons
8b972e410c haskell-Chart: updated to version 0.15 
svn path=/nixpkgs/trunk/; revision=31930
 2012-01-30 10:52:07 +00:00
Peter Simons
9d693c2e4e haskell-cmdargs: added version 0.9.2 
svn path=/nixpkgs/trunk/; revision=31929
 2012-01-30 10:52:04 +00:00
Peter Simons
293b72cf19 haskell-neither: updated to version 0.3.1 
svn path=/nixpkgs/trunk/; revision=31920
 2012-01-29 16:24:11 +00:00
Peter Simons
cab0e0119d haskell-mime-mail: updated to version 0.4.1.1 
svn path=/nixpkgs/trunk/; revision=31919
 2012-01-29 16:24:08 +00:00
Peter Simons
a11aaa99b2 haskell-explicit-exception: updated to version 0.1.6 
svn path=/nixpkgs/trunk/; revision=31918
 2012-01-29 16:24:05 +00:00
Peter Simons
e83a85ed6d haskell-bytestring-lexing: updated to version 0.3.0 
svn path=/nixpkgs/trunk/; revision=31917
 2012-01-29 16:24:02 +00:00
Peter Simons
bab857eb38 haskell-blaze-builder: updated to version 0.3.1.0 
svn path=/nixpkgs/trunk/; revision=31916
 2012-01-29 16:24:00 +00:00
Peter Simons
5792ce967f haskell-multiarg: added version 0.1.0.0 
svn path=/nixpkgs/trunk/; revision=31915
 2012-01-29 16:23:57 +00:00
Peter Simons
1bc0a60bf8 haskell-explicit-exception: added version 0.1.6 
svn path=/nixpkgs/trunk/; revision=31914
 2012-01-29 16:23:53 +00:00
Peter Simons
999502f95c haskell-zlib-bindings: updated to version 0.0.3 
svn path=/nixpkgs/trunk/; revision=31900
 2012-01-27 20:31:20 +00:00
Peter Simons
fb5c1e0687 haskell-test-framework: updated to version 0.4.2.1 
svn path=/nixpkgs/trunk/; revision=31899
 2012-01-27 20:31:17 +00:00
Peter Simons
8cc520bd88 haskell-test-framework-quickcheck2: updated to version 0.2.12 
svn path=/nixpkgs/trunk/; revision=31898
 2012-01-27 20:31:15 +00:00
Peter Simons
2be13ee004 haskell-test-framework-quickcheck: updated to version 0.2.8 
svn path=/nixpkgs/trunk/; revision=31897
 2012-01-27 20:31:12 +00:00
Peter Simons
45312449cc haskell-test-framework-hunit: updated to version 0.2.7 
svn path=/nixpkgs/trunk/; revision=31896
 2012-01-27 20:31:09 +00:00
Peter Simons
c3883364c6 haskell-ansi-wl-pprint: updated to version 0.6.4 
svn path=/nixpkgs/trunk/; revision=31895
 2012-01-27 20:31:06 +00:00
Peter Simons
47c3e4b2a3 haskell-zlib: added version 0.5.3.2 
This version is disabled for all versions of GHC older than 7.2, because
it won't build. Upstream has been notified.

svn path=/nixpkgs/trunk/; revision=31894
 2012-01-27 20:31:03 +00:00
Peter Simons
bbe935774d haskell-GLFW: added version 0.5.0.1 
svn path=/nixpkgs/trunk/; revision=31893
 2012-01-27 20:31:00 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk 
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
 2012-01-26 15:27:03 +00:00
Peter Simons
bc7b6215eb haskell-pool: updated to version 0.1.2.1 
svn path=/nixpkgs/trunk/; revision=31861
 2012-01-26 14:20:25 +00:00
Peter Simons
e63055f4de haskell-hakyll: updated to version 3.2.5.0 
svn path=/nixpkgs/trunk/; revision=31860
 2012-01-26 14:20:22 +00:00