1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Commit graph

8321 commits

Author SHA1 Message Date
aszlig 6dd94d680a
Merge minor updates from jcumming.
This merges branches 'libarchive.121020', 'gphoto2.121020' and 'ncmpcpp.121020'
of git://github.com/jcumming/nixpkgs.

Octopus merge of @jcumming's minor updates, apart flrom updating the version, a
few other changes were made to these packages as well:

 * libarchive: Now depends on xz.
 * libgphoto: License changed to LGPL 2.1 plus.

And he did an overhaul of some of the meta blocks as well.

Changes during this merge:

 * Inline and reword stray comment into meta tag in
   1db34880d7 (libgphoto).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-21 12:26:29 +02:00
Jack Cummings d8006ae368 - libarchive-3.0.4 2012-10-20 22:17:14 -07:00
Jack Cummings 1db34880d7 - gphoto2-2.4.14, libgphoto2-2.4.14 2012-10-20 21:59:25 -07:00
Lluís Batlle i Rossell c91bb2ed64 freetype: making it crossbuild fine for mips.
I think at some point the unwrapped build system gcc got into the PATH,
and that breaks some cross-builds, because the configure scripts now
choose the unwrapped gcc instead of the wrapped.
I'll search when it happened and how to overcome this better.
2012-10-20 10:53:22 +02:00
Ludovic Courtès c8d9220257 cairo: pass `libiconvOrEmpty'; fixes builds on non-GNU system 2012-10-19 14:10:24 +02:00
Ludovic Courtès 6f21c88ffc gnutls: update to 3.1.3 2012-10-19 14:10:24 +02:00
Ludovic Courtès 1189d3fb2a nettle: update to 2.5. 2012-10-19 14:10:24 +02:00
Peter Simons 118a5cf540 haskell-silently: update to version 1.2.3 2012-10-19 10:38:46 +02:00
Peter Simons 5741294501 haskell-DSH: update to version 0.8.2.2 2012-10-19 10:38:46 +02:00
Ludovic Courtès bf08f68ccb blas: really fix installation on FreeBSD 2012-10-18 17:35:00 +02:00
Peter Simons a8b903c849 haskell-zip-archive: update to version 0.1.2.1 2012-10-18 14:16:47 +02:00
Peter Simons fcc014e13e haskell-shelly: update to version 0.14.2 2012-10-18 14:16:47 +02:00
Peter Simons b15bc6df90 haskell-network-info: update to version 0.2.0.3 2012-10-18 14:16:47 +02:00
Peter Simons d51ef5ab35 haskell-monadcryptorandom: update to version 0.5 2012-10-18 14:16:47 +02:00
Peter Simons 49229ee47e haskell-dbus: update to version 0.10.2 2012-10-18 14:16:47 +02:00
Peter Simons 94827f5b5d haskell-conduit: update to version 0.5.2.7 2012-10-18 14:16:47 +02:00
Peter Simons 609b1b01c3 haskell-DSH: update to version 0.8.2.1 2012-10-18 14:16:46 +02:00
Ludovic Courtès 223b285776 cairo: clear all occurrences of `-ldl' on FreeBSD 2012-10-18 12:13:07 +02:00
Ludovic Courtès fa7f30bf5e glib: disable the NeXTstep on Darwin 2012-10-18 11:12:35 +02:00
Ludovic Courtès b9982a7d11 cairo: fix FreeBSD builds 2012-10-18 10:53:05 +02:00
Ludovic Courtès dc3fafe06d blas: `install -d' on FreeBSD 2012-10-18 10:21:24 +02:00
Michael Raskin cdb8f0dfe4 Update Lazarus 2012-10-17 22:24:39 +04:00
Eelco Dolstra f7436a9141 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-17 12:07:03 -04:00
Michael Raskin df2975f928 Update ECL to 12.7.1 2012-10-17 15:22:43 +04:00
Michael Raskin 3f0c47091c Update Clozure Common Lisp to version 1.8 2012-10-17 11:09:44 +04:00
Peter Simons 82e94ccbeb Merge branch 'master' into x-updates 2012-10-16 18:27:27 +02:00
Eelco Dolstra dbfcc9336c cairo: Update to 1.12.4 2012-10-16 12:00:41 -04:00
Eelco Dolstra fae22cb3e9 libpng: Update to 1.5.13 2012-10-16 11:56:31 -04:00
Eelco Dolstra 36b4ab4163 Fix building libxml2 on non-Linux platforms 2012-10-16 11:50:35 -04:00
Peter Simons 5679ad6964 haskell-language-javascript: update to version 0.5.6 2012-10-16 12:18:33 +02:00
Peter Simons 5984182d03 haskell-language-c-quote: update to version 0.4.3 2012-10-16 12:18:33 +02:00
Peter Simons 4fd9c94e0a haskell-hxt: update to version 9.3.1.1 2012-10-16 12:18:33 +02:00
Peter Simons 41d4bf099c haskell-digestive-functors: update to version 0.5.0.3 2012-10-16 12:18:32 +02:00
Peter Simons eb89801acf haskell-digestive-functors-snap: update to version 0.5.0.1 2012-10-16 12:18:32 +02:00
Peter Simons a13346961f haskell-cabal2nix: update to version 1.40 2012-10-15 20:23:43 +02:00
Peter Simons c8851cefbc haskell-dbus: add version 0.10.1 2012-10-15 20:17:33 +02:00
Peter Simons e7121b6f27 haskell-libxml-sax: add version 0.7.3 2012-10-15 20:17:33 +02:00
Peter Simons 34380b91a6 haskell-network-info: add version 0.2.0.2 2012-10-15 20:17:33 +02:00
Eelco Dolstra 5af277bbd1 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-15 12:16:58 -04:00
Eelco Dolstra 873595ee6d php: Update to 5.3.17
Also remove unsupported PHP 5.2 (which doesn't build anymore).

http://hydra.nixos.org/build/3131326
2012-10-15 11:14:26 -04:00
Peter Simons b1701fc609 haskell-alex-meta: update to version 0.3.0.5 2012-10-15 11:52:34 +02:00
Peter Simons cbc3cb7bd8 haskell-BNFC-meta: update to version 0.4 2012-10-15 11:52:34 +02:00
Peter Simons e87df1fd83 haskell-yesod: update to version 1.1.2 2012-10-15 11:52:34 +02:00
Peter Simons 35c7887d87 haskell-yesod-routes: update to version 1.1.0.2 2012-10-15 11:52:34 +02:00
Peter Simons 0fdc576cc0 haskell-yesod-core: update to version 1.1.3.1 2012-10-15 11:52:34 +02:00
Peter Simons b82db1ce31 haskell-warp: update to version 1.3.4.1 2012-10-15 11:52:33 +02:00
Peter Simons 9e617aaf96 haskell-symbol: update to version 0.1.4 2012-10-15 11:52:33 +02:00
Peter Simons b55333241e haskell-srcloc: update to version 0.3.0 2012-10-15 11:52:33 +02:00
Peter Simons e07de73dbe haskell-repa: update to version 3.2.2.2 2012-10-15 11:52:33 +02:00
Peter Simons c701ed4e83 haskell-numbers: update to version 3000.1.0.1 2012-10-15 11:52:33 +02:00