JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,316 Commits 2 Branches 0 Tags 13 GiB
e7c6623372
Commit Graph

4288 Commits

Author SHA1 Message Date
Yury G. Kudryashov
a41d989a1e svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=32093
 2012-02-06 23:08:11 +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
Yury G. Kudryashov
3312baae82 lcms2-2.3 
svn path=/nixpkgs/trunk/; revision=32088
 2012-02-06 22:08:04 +00:00
Peter Simons
66a1330589 v8/nodejs: upgraded to 3.6.6.20 and 0.6.9 
svn path=/nixpkgs/trunk/; revision=32079
 2012-02-06 19:08:56 +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
Yury G. Kudryashov
06a8db81ca qhull-2012.1 
svn path=/nixpkgs/trunk/; revision=32039
 2012-02-05 09:26:15 +00:00
Arie Middelkoop
3f1054b1ec Added 'bumblebee', a package that facilitates NVidia Optimus graphics with X11. 
Note: it relies heavily on 'virtualgl'. This also makes the approach taken
by bumblebee not very effective.
So, this package is actually mainly useful for shutting down your card so that
it does not consume power/produce heat.

See the comments in bumblebee/default.nix

svn path=/nixpkgs/trunk/; revision=32036
 2012-02-05 00:51:35 +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
Ludovic Courtès
f113ee27ad LZO 2.06. 
svn path=/nixpkgs/trunk/; revision=31988
 2012-02-02 20:49:42 +00:00
Yury G. Kudryashov
9758857fbe libdevil: pick a couple of debian patches 
svn path=/nixpkgs/trunk/; revision=31986
 2012-02-02 20:30:55 +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
Yury G. Kudryashov
89de1150d5 Add libnatspec 
svn path=/nixpkgs/trunk/; revision=31960
 2012-02-01 22:32:12 +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
Lluís Batlle i Rossell
d341b2537c Updating ffmpeg/x264/vpx 
svn path=/nixpkgs/trunk/; revision=31937
 2012-01-30 21:02:08 +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
Yury G. Kudryashov
71c28d0e33 Use meta.platforms 
svn path=/nixpkgs/trunk/; revision=31909
 2012-01-28 14:39:56 +00:00
Peter Simons
12e953b944 gmp: updated (unused) version 5.0.1 to 5.0.3 
svn path=/nixpkgs/trunk/; revision=31908
 2012-01-28 14:37:53 +00:00
Yury G. Kudryashov
9d67ff2a48 Remove glib-1.x and its reverse dependencies 
Nobody told me that he uses generator or xmms, so I'm removing this old stuff.

svn path=/nixpkgs/trunk/; revision=31907
 2012-01-28 13:06:07 +00:00
Peter Simons
37d2e2e917 gmp: renamed nix files to conform with coding guidelines 
svn path=/nixpkgs/trunk/; revision=31903
 2012-01-28 10:20:50 +00:00
Lluís Batlle i Rossell
415b2bb145 Adding cppnetlib 0.9.2. The last I found in their github. 
svn path=/nixpkgs/trunk/; revision=31901
 2012-01-27 20:40:44 +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
3256c40575 svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31878
 2012-01-27 11:48:58 +00:00
Ludovic Courtès
b793816a34 hwloc 1.4. 
svn path=/nixpkgs/trunk/; revision=31877
 2012-01-27 11:03:20 +00:00
Michael Raskin
51634c2137 Adding OpenSCAD - a 3D geometry interpreter 
svn path=/nixpkgs/trunk/; revision=31869
 2012-01-26 19:01:38 +00:00
Michael Raskin
53bcb2094f Adding CGAL: Computational Geometry Algorithms Library 
svn path=/nixpkgs/trunk/; revision=31868
 2012-01-26 18:28:53 +00:00
Michael Raskin
9f2be8d6b1 Update GLEW 
svn path=/nixpkgs/trunk/; revision=31867
 2012-01-26 18:04:02 +00:00
Sander van der Burg
4d266a5f56 Upgraded smack library to version 3.2.1 
svn path=/nixpkgs/trunk/; revision=31865
 2012-01-26 16:05:17 +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
Peter Simons
77b74105f6 haskell-fclabels: updated to version 1.1.0.2 
svn path=/nixpkgs/trunk/; revision=31859
 2012-01-26 14:20:20 +00:00
Peter Simons
a5d419ea5a haskell-resource-pool: added version 0.2.1.0 
svn path=/nixpkgs/trunk/; revision=31858
 2012-01-26 14:20:17 +00:00
Peter Simons
b968c011c6 haskell-pool-conduit: added version 0.0.0 
svn path=/nixpkgs/trunk/; revision=31857
 2012-01-26 14:20:14 +00:00
Peter Simons
4752d7201c haskell-ghc-mod: don't hard-code a specific version of emacsPackages into the expression itself 
Instead, one of the available version is chosen in haskell-packages.nix, when
the expression is instantiated.

Also updated the meta section.

svn path=/nixpkgs/trunk/; revision=31856
 2012-01-26 14:20:11 +00:00
Peter Simons
5f39616d9d haskell-ghc-mod: revert updated to version 1.0.7 
The check-in accidentally overwrote Emacs-specific extensions of the expression.

svn path=/nixpkgs/trunk/; revision=31826
 2012-01-24 22:06:33 +00:00
Peter Simons
3680b19ba5 haskell-zeromq-haskell: updated to version 0.8.3 
svn path=/nixpkgs/trunk/; revision=31822
 2012-01-24 15:06:37 +00:00
Peter Simons
c1782a6cf3 haskell-tls-extra: updated to version 0.4.2.1 
svn path=/nixpkgs/trunk/; revision=31821
 2012-01-24 15:06:35 +00:00
Peter Simons
b5c5f34de9 haskell-statistics: updated to version 0.10.1.0 
svn path=/nixpkgs/trunk/; revision=31820
 2012-01-24 15:06:32 +00:00
Peter Simons
3a9f2dd52f haskell-pretty-show: updated to version 1.2 
svn path=/nixpkgs/trunk/; revision=31819
 2012-01-24 15:06:30 +00:00
Peter Simons
ab05bdf5b0 haskell-mongoDB: updated to version 1.2.0 
svn path=/nixpkgs/trunk/; revision=31818
 2012-01-24 15:06:27 +00:00
Peter Simons
26692953cd haskell-instant-generics: updated to version 0.3.4 
svn path=/nixpkgs/trunk/; revision=31817
 2012-01-24 15:06:25 +00:00
Peter Simons
fdb8059a3d haskell-hxt: updated to version 9.2.0 
svn path=/nixpkgs/trunk/; revision=31816
 2012-01-24 15:06:23 +00:00
Peter Simons
076a50553d haskell-happstack-hamlet: updated to version 6.2.3 
svn path=/nixpkgs/trunk/; revision=31815
 2012-01-24 15:06:20 +00:00
Peter Simons
1898dbd6cb haskell-ghc-mod: updated to version 1.0.7 
svn path=/nixpkgs/trunk/; revision=31814
 2012-01-24 15:06:18 +00:00
Peter Simons
19764552a0 haskell-generic-deriving: updated to version 1.0.3 
svn path=/nixpkgs/trunk/; revision=31813
 2012-01-24 15:06:16 +00:00
Peter Simons
6ca63ba20a haskell-data-object-yaml: updated to version 0.3.4.1 
svn path=/nixpkgs/trunk/; revision=31812
 2012-01-24 15:06:13 +00:00
Peter Simons
d5e86595d6 haskell-criterion: updated to version 0.6.0.1 
svn path=/nixpkgs/trunk/; revision=31811
 2012-01-24 15:06:11 +00:00
Peter Simons
58a4717d0a haskell-bson: updated to version 0.1.7 
svn path=/nixpkgs/trunk/; revision=31810
 2012-01-24 15:06:08 +00:00
Peter Simons
592c7f453b haskell-aeson: updated to version 0.6.0.0 
svn path=/nixpkgs/trunk/; revision=31809
 2012-01-24 15:06:06 +00:00
Peter Simons
f99bad4225 haskell-HStringTemplate: updated to version 0.6.8 
svn path=/nixpkgs/trunk/; revision=31808
 2012-01-24 15:06:03 +00:00
Peter Simons
ea9708ca01 haskell-mwc-random: added version 0.11.0.0 
svn path=/nixpkgs/trunk/; revision=31807
 2012-01-24 15:06:00 +00:00
Peter Simons
5f7e961d15 haskell-HsOpenSSL: added version 0.10.1.2 
svn path=/nixpkgs/trunk/; revision=31806
 2012-01-24 15:05:57 +00:00
Peter Simons
9e5c06adc9 haskell-language-javascript: updated to version 0.4.6 
svn path=/nixpkgs/trunk/; revision=31805
 2012-01-24 15:05:54 +00:00
Peter Simons
76cbc8ade8 haskell-text: added version 0.11.1.13 
svn path=/nixpkgs/trunk/; revision=31804
 2012-01-24 15:05:51 +00:00
Karn Kallio
47ae4a01bd kdenlive builds for kde48 release candidate (and kde47). 
svn path=/nixpkgs/trunk/; revision=31802
 2012-01-24 04:50:55 +00:00
Andres Löh
bbc726c86a Adding haskell-DSH and dependencies. 
svn path=/nixpkgs/trunk/; revision=31794
 2012-01-23 16:22:34 +00:00
Eelco Dolstra
91b19832c9 * Fix the Darwin patch for OpenSSL. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31791
 2012-01-23 12:59:18 +00:00
Ludovic Courtès
44e38c020a libgc 7.2alpha6 (June 2011). 
svn path=/nixpkgs/trunk/; revision=31787
 2012-01-22 10:52:09 +00:00
Arie Middelkoop
c298a5ba25 Version bumb of libmsn to 4.2.1. 
This fixes the problem that with the previous version a connection with microsoft services could not be established anymore.

svn path=/nixpkgs/trunk/; revision=31786
 2012-01-21 23:59:36 +00:00
Peter Simons
70895ed45c haskell-lifted-base: updated to version 0.1.0.3 
svn path=/nixpkgs/trunk/; revision=31783
 2012-01-21 20:39:44 +00:00
Peter Simons
87f1f70070 mesa: disabled unmaintained i965 gallium driver 
svn path=/nixpkgs/trunk/; revision=31772
 2012-01-21 18:47:37 +00:00
Florian Friesdorf
89afc87de6 xapian-1.2.8 
svn path=/nixpkgs/trunk/; revision=31766
 2012-01-21 18:29:08 +00:00
Lluís Batlle i Rossell
4a1c721c01 Changing every reference from mips64-linux to mips64el-linux. That's 
what the new nix thinks the fuloong is.

Anyone having the old nix should use a nixpkgs previous to this change to build
the new nix. And then, with the new nix, he can use any newer nixpkgs revision.

svn path=/nixpkgs/trunk/; revision=31751
 2012-01-21 00:34:51 +00:00
Lluís Batlle i Rossell
6945a75f7b Adding a patch for mesa, for it to build on the loongson2f. 
svn path=/nixpkgs/trunk/; revision=31749
 2012-01-21 00:34:30 +00:00
Eelco Dolstra
22f3ff8f0d * OpenSSL updated to 1.0.0g. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31740
 2012-01-20 16:41:11 +00:00
Eelco Dolstra
bafc4ff59d * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31739
 2012-01-20 15:29:04 +00:00
Yury G. Kudryashov
c2b80e225c directfb-1.5.3 
svn path=/nixpkgs/trunk/; revision=31730
 2012-01-20 00:45:22 +00:00
Peter Simons
1bc803cb09 glib-2.28.x: blind commit that hopefully fixes a lot of build errors on Darwin 
It appears that users of glibc expect to be able to link libintl via pkgconfig.
On Linux, this always works because that library comes with glibc, but on other
platforms gettext is required to fulfill the dependency.

I don't have access to Darwin, so I cannot actually test this change. If any
runs into problems because of this modification, please feel free to revert it!

svn path=/nixpkgs/trunk/; revision=31723
 2012-01-19 21:43:17 +00:00
Peter Simons
e2633477c0 haskell-hakyll: updated to version 3.2.4.1 
svn path=/nixpkgs/trunk/; revision=31722
 2012-01-19 21:43:14 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
 2012-01-19 21:31:51 +00:00
Yury G. Kudryashov
d38c5e7ee4 KTorrent 4.1.3, fix build with KDE 4.8 
svn path=/nixpkgs/trunk/; revision=31713
 2012-01-19 20:28:05 +00:00
Eelco Dolstra
0894d407ce * Add the latest readline patch. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31709
 2012-01-19 17:37:21 +00:00
Peter Simons
f84e15f11c haskell-xml-conduit: updated to version 0.5.1.2 
svn path=/nixpkgs/trunk/; revision=31697
 2012-01-19 14:46:06 +00:00
Peter Simons
f52d0d1634 haskell-web-routes: updated to version 0.26.2 
svn path=/nixpkgs/trunk/; revision=31696
 2012-01-19 14:46:04 +00:00
Peter Simons
af2e5746af haskell-web-routes-quasi: updated to version 0.7.1.1 
svn path=/nixpkgs/trunk/; revision=31695
 2012-01-19 14:46:01 +00:00
Peter Simons
42105ddc82 haskell-vault: updated to version 0.1.0.0 
svn path=/nixpkgs/trunk/; revision=31694
 2012-01-19 14:45:59 +00:00
Peter Simons
9af6a32767 haskell-shakespeare-css: updated to version 0.10.6 
svn path=/nixpkgs/trunk/; revision=31693
 2012-01-19 14:45:56 +00:00
Peter Simons
c037e74e61 haskell-neither: updated to version 0.3.0.1 
svn path=/nixpkgs/trunk/; revision=31692
 2012-01-19 14:45:51 +00:00
Peter Simons
d1645c819d haskell-json-enumerator: updated to version 0.0.1.2 
svn path=/nixpkgs/trunk/; revision=31691
 2012-01-19 14:45:47 +00:00
Peter Simons
5e9d807f5f haskell-http-enumerator: updated to version 0.7.2.5 
svn path=/nixpkgs/trunk/; revision=31690
 2012-01-19 14:45:44 +00:00
Peter Simons
ac0ab1b200 haskell-hamlet: updated to version 0.10.7.1 
svn path=/nixpkgs/trunk/; revision=31689
 2012-01-19 14:45:41 +00:00
Peter Simons
007bb142bd haskell-data-object: updated to version 0.3.1.9 
svn path=/nixpkgs/trunk/; revision=31688
 2012-01-19 14:45:38 +00:00
Peter Simons
4bf2f17323 haskell-convertible-text: updated to version 0.4.0.2 
svn path=/nixpkgs/trunk/; revision=31687
 2012-01-19 14:45:29 +00:00
Peter Simons
5856dbaa53 haskell-control-monad-attempt: updated to version 0.3.0.1 
svn path=/nixpkgs/trunk/; revision=31686
 2012-01-19 14:45:14 +00:00
Peter Simons
40a684701a haskell-blaze-textual-native: updated to version 0.2.1.1 
svn path=/nixpkgs/trunk/; revision=31685
 2012-01-19 14:45:10 +00:00
Peter Simons
62e31a562f haskell-aeson-native: updated to version 0.3.3.2 
svn path=/nixpkgs/trunk/; revision=31684
 2012-01-19 14:44:55 +00:00
Peter Simons
13e5cf2efb haskell-vault: added version 0.1.0.0 
svn path=/nixpkgs/trunk/; revision=31683
 2012-01-19 14:44:33 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
 2012-01-18 20:53:01 +00:00
Ludovic Courtès
ffdd332cf7 libassuan 2.0.3. 
svn path=/nixpkgs/trunk/; revision=31672
 2012-01-18 20:52:36 +00:00
Ludovic Courtès
16753086a3 GNU Libidn 1.24. 
svn path=/nixpkgs/trunk/; revision=31671
 2012-01-18 20:52:31 +00:00
Ludovic Courtès
8aaa52d532 GNU Common C++ 5.1.2. 
svn path=/nixpkgs/trunk/; revision=31669
 2012-01-18 20:52:22 +00:00
Ludovic Courtès
9d5df9699b GnuTLS 3.0.11. 
svn path=/nixpkgs/trunk/; revision=31665
 2012-01-18 20:52:02 +00:00
Peter Simons
02392785c5 ghc-mod: new package (emacs haskell-mode extension) 
svn path=/nixpkgs/trunk/; revision=31653
 2012-01-18 20:32:34 +00:00
Peter Simons
7abb4986a2 v8: upgraded to latest stable 3.6 version (which node.js uses) 
svn path=/nixpkgs/trunk/; revision=31649
 2012-01-18 20:32:23 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Eelco Dolstra
923054c924 * Fix libvirt. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31642
 2012-01-18 19:47:39 +00:00
Eelco Dolstra
03fb0e59ef * Fix GHC. The bootstrap binaries depend on libgmp.so.3, which is 
provided by GMP 4 but not GMP 5.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31639
 2012-01-18 18:43:34 +00:00
Eelco Dolstra
e6d6520a56 * Update libsigc++ to get it to build again 
(http://hydra.nixos.org/build/1803247).

svn path=/nixpkgs/branches/stdenv-updates/; revision=31637
 2012-01-18 17:14:18 +00:00
Eelco Dolstra
48ee2523da * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
 2012-01-18 15:53:12 +00:00
Peter Simons
a0672a86dc haskell-yaml: updated to version 0.5.1.2 
svn path=/nixpkgs/trunk/; revision=31630
 2012-01-18 15:09:47 +00:00
Peter Simons
a0e44836a4 haskell-xml-conduit: updated to version 0.5.1.1 
svn path=/nixpkgs/trunk/; revision=31629
 2012-01-18 15:09:45 +00:00
Peter Simons
6094053539 haskell-zlib-conduit: updated to version 0.0.1 
svn path=/nixpkgs/trunk/; revision=31628
 2012-01-18 15:04:24 +00:00
Peter Simons
45bd1f2365 haskell-xml: updated to version 1.3.12 
svn path=/nixpkgs/trunk/; revision=31627
 2012-01-18 15:04:21 +00:00
Peter Simons
4401790252 haskell-tls: updated to version 0.8.5 
svn path=/nixpkgs/trunk/; revision=31626
 2012-01-18 15:04:19 +00:00
Peter Simons
2448541afc haskell-data-accessor-template: updated to version 0.2.1.9 
svn path=/nixpkgs/trunk/; revision=31625
 2012-01-18 15:04:16 +00:00
Peter Simons
8cc90001d9 haskell-blaze-builder-conduit: updated to version 0.0.1 
svn path=/nixpkgs/trunk/; revision=31624
 2012-01-18 15:04:14 +00:00
Peter Simons
494083fbf6 haskell-attoparsec-conduit: updated to version 0.0.1 
svn path=/nixpkgs/trunk/; revision=31623
 2012-01-18 15:04:11 +00:00
Peter Simons
39204c8649 haskell-http-enumerator: updated to version 0.7.2.4 
svn path=/nixpkgs/trunk/; revision=31610
 2012-01-17 17:44:42 +00:00
Peter Simons
47aaa3a4c0 haskell-http-conduit: updated to version 1.1.2.2 
svn path=/nixpkgs/trunk/; revision=31609
 2012-01-17 17:44:39 +00:00
Peter Simons
7b6b4212b9 haskell-colour: updated to version 2.3.3 
svn path=/nixpkgs/trunk/; revision=31608
 2012-01-17 17:44:35 +00:00
Ludovic Courtès
eb1360bd66 hwloc: Make it easy to disable optional dependencies; fix cross-builds. 
svn path=/nixpkgs/trunk/; revision=31606
 2012-01-17 16:34:10 +00:00
Peter Simons
729aea56b5 haskell-xml: updated to version 1.3.11 
svn path=/nixpkgs/trunk/; revision=31603
 2012-01-17 10:24:53 +00:00
Peter Simons
683d60e419 haskell-iteratee: updated to version 0.8.8.1 
svn path=/nixpkgs/trunk/; revision=31602
 2012-01-17 10:24:47 +00:00
Ludovic Courtès
4cbd319ce3 libffi: Revert to 3.0.9. 
Version 3.0.10 fails to build on x86_64-freebsd8.2.  Reported on
libffi-discuss@sourceware.org.

svn path=/nixpkgs/trunk/; revision=31601
 2012-01-16 23:36:05 +00:00
Ludovic Courtès
92703a6d9e libffi 3.0.10. 
svn path=/nixpkgs/trunk/; revision=31600
 2012-01-16 21:59:33 +00:00
Yury G. Kudryashov
6957240078 Fix typo 
svn path=/nixpkgs/trunk/; revision=31599
 2012-01-16 17:50:54 +00:00
Yury G. Kudryashov
ee0822153a Upgrade libdrm and mesa to the latest versions 
svn path=/nixpkgs/trunk/; revision=31598
 2012-01-16 17:48:33 +00:00
Yury G. Kudryashov
81b4eef864 jasper: propagate libjpeg, kopete: remove 'fix' 
svn path=/nixpkgs/trunk/; revision=31595
 2012-01-16 17:36:59 +00:00
Peter Simons
5d03943ec7 haskell-ghc-events: updated to version 0.4.0.0 
svn path=/nixpkgs/trunk/; revision=31591
 2012-01-16 11:47:57 +00:00
Peter Simons
4cc9c46240 haskell-xml-types: updated to version 0.3.1 
svn path=/nixpkgs/trunk/; revision=31588
 2012-01-16 11:33:55 +00:00
Peter Simons
a4d0d699ea haskell-xml-conduit: updated to version 0.5.1 
svn path=/nixpkgs/trunk/; revision=31587
 2012-01-16 11:33:52 +00:00
Peter Simons
bae87bb714 haskell-random-shuffle: updated to version 0.0.3 
svn path=/nixpkgs/trunk/; revision=31586
 2012-01-16 11:33:50 +00:00
Peter Simons
bfb2f12099 haskell-http-conduit: updated to version 1.1.1 
svn path=/nixpkgs/trunk/; revision=31585
 2012-01-16 11:33:48 +00:00
Peter Simons
c74f588e8d haskell-enumerator: updated to version 0.4.18 
svn path=/nixpkgs/trunk/; revision=31584
 2012-01-16 11:33:45 +00:00
Peter Simons
a9f5e79a1b haskell-conduit: updated to version 0.0.4 
svn path=/nixpkgs/trunk/; revision=31583
 2012-01-16 11:33:42 +00:00
Peter Simons
89f9d84c5f haskell-cereal: updated to version 0.3.5.1 
svn path=/nixpkgs/trunk/; revision=31582
 2012-01-16 11:33:40 +00:00
Peter Simons
4b229a7291 haskell-base64-bytestring: updated to version 0.1.1.0 
svn path=/nixpkgs/trunk/; revision=31581
 2012-01-16 11:33:38 +00:00
Peter Simons
4907bb6cf5 haskell-math-functions: added version 0.1.1.0 
svn path=/nixpkgs/trunk/; revision=31580
 2012-01-16 11:33:34 +00:00
Peter Simons
b7c53fcc4c ftgl: added meta information 
svn path=/nixpkgs/trunk/; revision=31573
 2012-01-15 11:44:11 +00:00
Peter Simons
116a7c4ac2 ftgl: fixed download URL 
svn path=/nixpkgs/trunk/; revision=31571
 2012-01-15 11:44:05 +00:00
Yury G. Kudryashov
0c79434ccb svn merge ^/nixpkgs/trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
 2012-01-14 21:34:37 +00:00
Yury G. Kudryashov
6232b9129d cairo: propagate more dependencies 
svn path=/nixpkgs/trunk/; revision=31565
 2012-01-14 18:04:28 +00:00
Yury G. Kudryashov
77c6648535 Propagate zlib 
svn path=/nixpkgs/trunk/; revision=31551
 2012-01-14 18:03:38 +00:00
Yury G. Kudryashov
51956f085d ntrack-016, add meta 
svn path=/nixpkgs/trunk/; revision=31550
 2012-01-14 18:03:34 +00:00
Yury G. Kudryashov
b891f159b5 grantlee-0.2.0 
svn path=/nixpkgs/trunk/; revision=31542
 2012-01-14 18:03:05 +00:00
Yury G. Kudryashov
e7dccbfcb8 openbabel-2.3.1, depend on cairo 
svn path=/nixpkgs/trunk/; revision=31540
 2012-01-14 18:02:54 +00:00
Yury G. Kudryashov
cf207c3e83 libical-0.48 
svn path=/nixpkgs/trunk/; revision=31539
 2012-01-14 18:02:46 +00:00
Peter Simons
4e5092d0c6 Revert "libdrm: updated to version 2.4.29" 
This reverts commit ebe85f30fa075507313fc9dfa6ceb96501c6e332.

svn path=/nixpkgs/trunk/; revision=31537
 2012-01-14 12:13:53 +00:00
Peter Simons
729162873e Revert "mesa: updated to version 7.11.2" 
This reverts commit b18ddb0ac8bc232df2cfd2980bd22ee9beae7b12.

svn path=/nixpkgs/trunk/; revision=31536
 2012-01-14 12:13:51 +00:00
Peter Simons
61ad4a1b2b haskell-streamproc: updated to version 1.6 
svn path=/nixpkgs/trunk/; revision=31535
 2012-01-14 12:09:20 +00:00
Peter Simons
736b039b3f libdrm: updated to version 2.4.29 
svn path=/nixpkgs/trunk/; revision=31534
 2012-01-14 12:09:15 +00:00
Peter Simons
0819c85d91 mesa: updated to version 7.11.2 
svn path=/nixpkgs/trunk/; revision=31533
 2012-01-14 12:09:09 +00:00
Peter Simons
5331d4e98b haskell-wxdirect: updated to version 0.13.1.1 
svn path=/nixpkgs/trunk/; revision=31519
 2012-01-13 10:32:11 +00:00
Peter Simons
c334c8b547 haskell-wxcore: updated to version 0.13.2 
svn path=/nixpkgs/trunk/; revision=31518
 2012-01-13 10:32:08 +00:00
Peter Simons
e495d3345f haskell-wx: updated to version 0.13.2 
svn path=/nixpkgs/trunk/; revision=31517
 2012-01-13 10:32:06 +00:00
Peter Simons
dd90ec0d92 wxGTK-2.x: enable support for media control 
svn path=/nixpkgs/trunk/; revision=31516
 2012-01-13 10:32:02 +00:00
Peter Simons
6284c83b15 wxGTK-2.x: enable parallel building 
svn path=/nixpkgs/trunk/; revision=31515
 2012-01-13 10:31:58 +00:00
Peter Simons
1585c62857 pkgs/development/libraries/wxGTK-2.8: strip trailing whitespace 
svn path=/nixpkgs/trunk/; revision=31514
 2012-01-13 10:31:56 +00:00
Peter Simons
d7985d419f pkgs/development/libraries/wxGTK-2.9: renamed Nix files for consistency 
svn path=/nixpkgs/trunk/; revision=31513
 2012-01-13 10:31:52 +00:00
Peter Simons
4ae7c66bc0 haskell-xml-conduit: updated to version 0.5.0.1 
svn path=/nixpkgs/trunk/; revision=31512
 2012-01-13 09:27:15 +00:00
Peter Simons
9b408f567d haskell-vty: updated to version 4.7.0.8 
svn path=/nixpkgs/trunk/; revision=31511
 2012-01-13 09:27:13 +00:00
Peter Simons
9f4723abd5 haskell-attoparsec-conduit: updated to version 0.0.0.1 
svn path=/nixpkgs/trunk/; revision=31510
 2012-01-13 09:27:10 +00:00
Peter Simons
c3cf936ff1 haskell-hxt: updated to version 9.1.6 
svn path=/nixpkgs/trunk/; revision=31499
 2012-01-12 15:21:22 +00:00
Peter Simons
7bcb27653d haskell-hxt-unicode: updated to version 9.0.2 
svn path=/nixpkgs/trunk/; revision=31498
 2012-01-12 15:21:18 +00:00
Peter Simons
de7bd112f1 haskell-hxt-regex-xmlschema: updated to version 9.0.4 
svn path=/nixpkgs/trunk/; revision=31497
 2012-01-12 15:21:15 +00:00
Peter Simons
c9fc73ae45 haskell-hxt-charproperties: updated to version 9.1.1 
svn path=/nixpkgs/trunk/; revision=31496
 2012-01-12 15:21:11 +00:00
Peter Simons
867fb191cc haskell-haskell-src-meta: updated to version 0.5.0.3 
svn path=/nixpkgs/trunk/; revision=31495
 2012-01-12 15:21:08 +00:00
Peter Simons
b6dc8c87d8 haskell-conduit: updated to version 0.0.3 
svn path=/nixpkgs/trunk/; revision=31494
 2012-01-12 15:20:50 +00:00
Peter Simons
0eeb206fb5 haskell-irc: updated to version 0.5.0.0 
svn path=/nixpkgs/trunk/; revision=31479
 2012-01-11 14:40:49 +00:00
Peter Simons
415ef89393 haskell-conduit: updated to version 0.0.2 
svn path=/nixpkgs/trunk/; revision=31478
 2012-01-11 14:40:44 +00:00
Peter Simons
3be3fe0828 haskell-primitive: updated to version 0.4.1 
svn path=/nixpkgs/trunk/; revision=31466
 2012-01-10 15:20:26 +00:00
Peter Simons
79c34b96e1 haskell-failure: updated to version 0.1.2 
svn path=/nixpkgs/trunk/; revision=31465
 2012-01-10 15:20:23 +00:00
Peter Simons
83ed01cc12 haskell-zlib-bindings: updated to version 0.0.2 
svn path=/nixpkgs/trunk/; revision=31454
 2012-01-09 10:42:38 +00:00
Peter Simons
526f4172c2 haskell-skein: updated to version 0.1.0.4 
svn path=/nixpkgs/trunk/; revision=31453
 2012-01-09 10:42:34 +00:00
Yury G. Kudryashov
f4a079a76c Upgrade xine-lib and xine-ui 
svn path=/nixpkgs/trunk/; revision=31451
 2012-01-09 10:25:56 +00:00
Yury G. Kudryashov
ff5134f8b0 Add lirc 
svn path=/nixpkgs/trunk/; revision=31450
 2012-01-09 10:25:49 +00:00
Yury G. Kudryashov
c80ed42cf1 Add GNU vcdimager 
svn path=/nixpkgs/trunk/; revision=31449
 2012-01-09 10:25:42 +00:00
Yury G. Kudryashov
7e66541ce8 Add bunch of kmymoney-4.6.1 dependencies 
svn path=/nixpkgs/trunk/; revision=31436
 2012-01-08 19:29:07 +00:00
Yury G. Kudryashov
9ee0a9df9b svn merge ^/nixpkgs/trunk 
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
 2012-01-08 16:01:12 +00:00
Peter Simons
d85921798b haskell-hakyll: updated to version 3.2.4.0 
svn path=/nixpkgs/trunk/; revision=31427
 2012-01-07 21:51:36 +00:00
Peter Simons
2da358e6f4 haskell-conduit: updated to version 0.0.1.1 
svn path=/nixpkgs/trunk/; revision=31426
 2012-01-07 21:51:32 +00:00