Commit graph

6855 commits

Author SHA1 Message Date
Lluís Batlle i Rossell a81366984e Updating octave to 3.6.0
svn path=/nixpkgs/trunk/; revision=32451
2012-02-21 11:34:57 +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
Eelco Dolstra 45fed14272 * Revert r32435. We'll be doing a stdenv merge in a few days, so
let's put it in there rather than having the Nth near-complete
  rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436
2012-02-20 18:59:43 +00:00
Peter Simons 95cbf4ed55 Modified the Python 2.7 expression so that the interpreter has unconditional
OpenSSL support. Having OpenSSL available at the time the core interpreter is
built enables all kinds of important crypto features (i.e. additional hashlib
algorithms, etc.) that otherwise won't be available.

svn path=/nixpkgs/trunk/; revision=32435
2012-02-20 18:52:52 +00:00
Peter Simons 9cc0657c86 haskell-hlint: updated to version 1.8.24
svn path=/nixpkgs/trunk/; revision=32422
2012-02-20 10:45:02 +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
Yury G. Kudryashov 4c5aaf3736 qtscriptgenerator: qt-4.8 patch
svn path=/nixpkgs/trunk/; revision=32414
2012-02-20 05:27:57 +00:00
Eelco Dolstra 1133387eb1 * Fix rubberband.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32404
2012-02-19 17:20:20 +00:00
Eelco Dolstra 0922e0fb71 * Remove ocaml 3.11.1. It doesn't build anymore and isn't used anywhere.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32403
2012-02-19 17:12:37 +00:00
Eelco Dolstra a50d32e4db * Fix oprofile.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32402
2012-02-19 17:03:38 +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
Lluís Batlle i Rossell 3b02e6f70d Updating super tux kart to 0.7.3. I also add the library irrlicht, the specific
version needed for super tux kart.


svn path=/nixpkgs/trunk/; revision=32399
2012-02-19 13:15:50 +00:00
Yury G. Kudryashov 61e7d39e05 libpng-1.5.9 (see CVE 2011-3026)
svn path=/nixpkgs/branches/libpng15/; revision=32398
2012-02-19 11:23:05 +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
Yury G. Kudryashov 5c6a3faf4e Merge ^/nixpkgs/trunk
svn tried to change libpng/default.nix version, I've changed libpng/12.nix
version manually.

svn path=/nixpkgs/branches/libpng15/; revision=32395
2012-02-19 11:06:00 +00:00
Yury G. Kudryashov 668a505214 libpng-1.2.47 (see CVE 2011-3026)
svn path=/nixpkgs/trunk/; revision=32394
2012-02-19 10:59:31 +00:00
Lluís Batlle i Rossell d77cfce6d3 Adding bullet. Patch by Alexander Foremny.
svn path=/nixpkgs/trunk/; revision=32393
2012-02-19 10:51:04 +00:00
Yury G. Kudryashov 024c247807 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32382
2012-02-18 16:26:34 +00:00
Shea Levy e45be4fcaf Remove coffee-script rubygem
A seeming bug the "nix" rubygem causes activesupport's dependencies to be set
incorrectly when execjs is one of the relevant gems. I'll try to fix it, but
until then IMO a working activesupport is more important than coffee-script

svn path=/nixpkgs/trunk/; revision=32377
2012-02-17 22:34:46 +00:00
Ludovic Courtès 5481e67e23 GNU libc: Backport Hurd-related changes from glibc 2.12 in trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32374
2012-02-17 22:12:40 +00:00
Eelco Dolstra 0811db080e * Move all glibc versions to development/libraries/glibc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32373
2012-02-17 22:02:37 +00:00
Eelco Dolstra 6c2de318ad * Move all gcc versions to development/compilers/gcc.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32371
2012-02-17 21:47:08 +00:00
Shea Levy 86710c1fe6 Ruby gems: Install all dependent gems in the user environment
svn path=/nixpkgs/trunk/; revision=32370
2012-02-17 21:40:14 +00:00
Shea Levy 2fb0d1c6c7 Update ruby/rubygems
svn path=/nixpkgs/trunk/; revision=32366
2012-02-17 20:33:15 +00:00
Eelco Dolstra da3ecd1256 * gcc-apple: produce a libstdc++.dylib that doesn't depend on
/usr/lib/libstdc++.dylib.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32365
2012-02-17 19:33:12 +00:00
Eelco Dolstra 0e6c77befa * On Darwin, don't link Perl against /usr/lib/libutil.dylib. Libutil
uses /usr/lib/libstdc++.dylib, and so we get segfaults when using
  Perl modules that depend on another libstdc++.dylib (like Nix's Perl
  bindings).  It doesn't appear that libutil provides useful
  functionality for Perl on Darwin.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32364
2012-02-17 19:32:15 +00:00
Yury G. Kudryashov c1c3317f65 vigra: fix install
svn path=/nixpkgs/trunk/; revision=32362
2012-02-17 18:50:29 +00:00
Yury G. Kudryashov 14a5b4991c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32360
2012-02-17 17:44:20 +00:00
Yury G. Kudryashov e446dee4c3 Backport r32353 from stdenv-udpates
* Get rid of Qt 4.6.  It doesn't compile with GCC 4.6.  There was only
  one application still using it (Caneda), but upgrading it allowed it
  to build with Qt 4.7.

Eelco, could you please fix the date in caneda version?

svn path=/nixpkgs/trunk/; revision=32359
2012-02-17 17:40:58 +00:00
Eelco Dolstra d575666a12 * Fix building zlib on Cygwin.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32358
2012-02-17 17:02:18 +00:00
Eelco Dolstra 31ebc5d950 * Get rid of Qt 4.6. It doesn't compile with GCC 4.6. There was only
one application still using it (Caneda), but upgrading it allowed it
  to build with Qt 4.7.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32353
2012-02-17 14:34:42 +00:00
Eelco Dolstra b23126fcc3 * Include the kernel version in kernel-specific packages so that they
can be distinguished in nix-env -qa output.

svn path=/nixpkgs/trunk/; revision=32352
2012-02-17 14:32:28 +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
Yury G. Kudryashov ed8caa2c7f svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32347
2012-02-17 13:10:05 +00:00
Yury G. Kudryashov afb26b6aed vigra-1.8.0
svn path=/nixpkgs/trunk/; revision=32346
2012-02-17 13:03:41 +00:00
Yury G. Kudryashov 572a26b27e mediastreamer-2.8.0
svn path=/nixpkgs/trunk/; revision=32343
2012-02-17 13:03:27 +00:00
Arie Middelkoop f8b1a1db26 Coccinelle: wrapper for 'spatch.opt'.
There was already a wrapper for spatch, but not for the optimized version 'spatch.opt'.
Actually, for coccinelle in nixpkgs, I'd propose to only provide the optimized version of
spatch, as it makes no difference for the end user.

svn path=/nixpkgs/trunk/; revision=32341
2012-02-16 23:55:46 +00:00
Yury G. Kudryashov f8926aa0d7 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32335
2012-02-16 18:18:34 +00:00
Peter Simons 255dc2478d haskell-cabal2nix: updated to version 1.27
svn path=/nixpkgs/trunk/; revision=32332
2012-02-16 17:48:28 +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
Yury G. Kudryashov 070874c5f1 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32321
2012-02-16 11:23:36 +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
Shea Levy 75d4746680 Update rubygems
svn path=/nixpkgs/trunk/; revision=32309
2012-02-16 02:07:23 +00:00
Eelco Dolstra b9309ffdaf * Typo (spotted by Danny Groenewegen).
svn path=/nixpkgs/trunk/; revision=32307
2012-02-15 16:30:46 +00:00
Eelco Dolstra 0b0f44b117 * Updated apr to 1.4.6 and apr-util to 1.4.1.
svn path=/nixpkgs/trunk/; revision=32303
2012-02-15 16:21:33 +00:00
Peter Simons ca1912036b cppcheck: added version 1.53
svn path=/nixpkgs/trunk/; revision=32302
2012-02-15 16:07:45 +00:00
Peter Simons c5d870f1d8 sparse: updated to version 0.4.4
svn path=/nixpkgs/trunk/; revision=32301
2012-02-15 16:07:38 +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 844d950d13 haskell-cabal2nix: updated to version 1.26
svn path=/nixpkgs/trunk/; revision=32291
2012-02-14 16:59:04 +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 3c63b41aa4 haskell-tar: added version 0.4.0.0
svn path=/nixpkgs/trunk/; revision=32277
2012-02-14 16:58:27 +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
Peter Simons ebdb515865 pkgs/development/compilers/gcc-4.6: added 'enablePlugin' attribute (defaults to false) to add support for GCC plugins (such as melt)
svn path=/nixpkgs/branches/stdenv-updates/; revision=32275
2012-02-14 14:42:59 +00:00
Peter Simons 35a4593277 pkgs/development/compilers/gcc-4.6: strip trailing whitespace
svn path=/nixpkgs/branches/stdenv-updates/; revision=32274
2012-02-14 14:42:56 +00:00
Peter Simons 02eaa57b56 merge latest changes from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32270
2012-02-14 13:47:27 +00:00
Sander van der Burg ba4e2e775a Bumped GeoIP java library to version 1.2.5
svn path=/nixpkgs/trunk/; revision=32268
2012-02-14 10:53:09 +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
Arie Middelkoop 456d380cef Fixed poweroff/reboot in "consolekit" for NixOS.
svn path=/nixpkgs/trunk/; revision=32261
2012-02-13 17:15:34 +00:00
Lluís Batlle i Rossell 0a85d5cf98 Blind commit about making nvidia-cg-toolkit build for i686-linux
svn path=/nixpkgs/trunk/; revision=32258
2012-02-13 13:59:12 +00:00
Lluís Batlle i Rossell 1a5c12c34c I made stuntrally work, thanks to adding the nvidia_cg_toolkit to ogre.
svn path=/nixpkgs/trunk/; revision=32257
2012-02-13 13:41:57 +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
Peter Simons d53d97ad5e haskell-HaRe: updated to version 0.6.0.2
svn path=/nixpkgs/trunk/; revision=32238
2012-02-13 09:01:46 +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
Yury G. Kudryashov af62434159 kmymoney-4.6.2, fix build with qt-4.8
svn path=/nixpkgs/trunk/; revision=32230
2012-02-11 21:15:16 +00:00
Lluís Batlle i Rossell 9ae92c3d69 Updating zziplib
svn path=/nixpkgs/trunk/; revision=32222
2012-02-10 21:56:45 +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
Yury G. Kudryashov c84eb70b51 Latest exosip and linphone
svn path=/nixpkgs/trunk/; revision=32172
2012-02-10 10:13:48 +00:00
Yury G. Kudryashov f8d0599756 Add tclap (required for new hugin)
svn path=/nixpkgs/trunk/; revision=32169
2012-02-10 10:13:34 +00:00
Shea Levy f77fa09f56 v8: Get building on darwin
svn path=/nixpkgs/trunk/; revision=32168
2012-02-10 05:22:58 +00:00
Lluís Batlle i Rossell 232da3a29d Adding a new url for isl.src. The current is only meant for the last version.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32167
2012-02-09 19:53:01 +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
Eelco Dolstra 3a4595d679 * zlib should be a propagated build input of libzip.
svn path=/nixpkgs/trunk/; revision=32160
2012-02-09 14:22:13 +00:00
Eelco Dolstra 2051002180 * libzip updated to 0.10.
svn path=/nixpkgs/trunk/; revision=32159
2012-02-09 14:09:08 +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
Ludovic Courtès 452cdc59f1 GNU Guile: Use the right configure option name.
svn path=/nixpkgs/trunk/; revision=32154
2012-02-09 10:07:42 +00:00
Lluís Batlle i Rossell f113fbb5dd Fixing the xine lib build, for problems building with zlib 1.2.6
svn path=/nixpkgs/branches/stdenv-updates/; revision=32153
2012-02-09 09:35:54 +00:00
Ludovic Courtès 1d44b332ed GNU Guile: Disable pthread support on FreeBSD.
svn path=/nixpkgs/trunk/; revision=32152
2012-02-09 09:16:17 +00:00
Peter Simons d450c760f8 haskell-Ebnf2ps: updated to version 1.0.10
svn path=/nixpkgs/trunk/; revision=32149
2012-02-08 23:06:04 +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 0df0d9ad9c Ebnf2ps: the package is now available from Hackage
svn path=/nixpkgs/trunk/; revision=32147
2012-02-08 22:07:42 +00:00
Lluís Batlle i Rossell 3782f740a0 Adding libwebp
svn path=/nixpkgs/trunk/; revision=32146
2012-02-08 21:37:20 +00:00
Lluís Batlle i Rossell d83e1b4b5d Updating libvorbis and libogg, and enabling by default libvorbis and libxvid on ffmpeg.
I think there are little drawbacks on that, whlie there are benefits.


svn path=/nixpkgs/trunk/; revision=32145
2012-02-08 19:54:16 +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
Yury G. Kudryashov 0de0994bc4 zlib: largefile_source problem fixed upstream
svn path=/nixpkgs/branches/stdenv-updates/; revision=32135
2012-02-08 05:05:46 +00:00
Lluís Batlle i Rossell 1f3f0e6b65 Updating zlib. The zlib.net site is down, but I could pick the file from a gentoo distfiles mirror.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32133
2012-02-07 21:51:03 +00:00
Yury G. Kudryashov a8dba7888b Move gtkLibs3x to top-level namespace, gtk+-3.2.3
Cherry-pick /nixpkgs/branches/glib-2.30@32044

svn path=/nixpkgs/trunk/; revision=32129
2012-02-07 21:03:16 +00:00
Yury G. Kudryashov acd9d6b42e pango-1.29: use fetchurl
cherry-pick /nixpkgs/branches/glib-2.30@32043

svn path=/nixpkgs/trunk/; revision=32128
2012-02-07 21:03:12 +00:00
Peter Simons 6789ec0c84 haskell-cpphs: updated to version 1.13.3
svn path=/nixpkgs/trunk/; revision=32107
2012-02-07 10:34:43 +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 c615cbae70 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32099
2012-02-07 09:38:20 +00:00
Lluís Batlle i Rossell a21457ffa8 Updating crypto++ to 5.6.1
svn path=/nixpkgs/trunk/; revision=32098
2012-02-07 09:18:04 +00:00
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 5a34b4f9a1 uhc: upgraded to 1.1.3
svn path=/nixpkgs/trunk/; revision=32081
2012-02-06 19:09:01 +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 31298a29ae haskell-hlint: updated to version 1.8.23
svn path=/nixpkgs/trunk/; revision=32069
2012-02-06 14:28:02 +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 20f8c35e07 haskell-happy: added version 1.18.9
svn path=/nixpkgs/trunk/; revision=32052
2012-02-06 14:27:18 +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
Shea Levy b59eac3bfc Add autotest-rails gem
svn path=/nixpkgs/trunk/; revision=32033
2012-02-04 15:04:04 +00:00
Peter Simons dbafd99a0a Moved python debugger into development/tools hierarchy.
svn path=/nixpkgs/trunk/; revision=32027
2012-02-04 09:30:53 +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
Yury G. Kudryashov a810d44d81 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=32024
2012-02-03 21:33:28 +00:00
Peter Simons 868d8c2d9c haskell-cabal2nix: updated to version 1.25
svn path=/nixpkgs/trunk/; revision=32021
2012-02-03 21:00:32 +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
Peter Simons ade99756f9 haskell-idris: updated to version 0.9.1
svn path=/nixpkgs/trunk/; revision=31996
2012-02-03 19:06:12 +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
Karn Kallio cdf1a3a3c6 Racket version 5.2.1
svn path=/nixpkgs/trunk/; revision=31990
2012-02-02 22:41:21 +00:00
Andres Löh b66db5ca13 Add ghc-7.4.1. Remove Hydra building for the 7.2.* series.
svn path=/nixpkgs/trunk/; revision=31989
2012-02-02 21:08:30 +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 df037ddafd svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/libpng15/; revision=31987
2012-02-02 20:36:11 +00:00