Commit graph

6003 commits

Author SHA1 Message Date
Yury G. Kudryashov 2bca92e32d Merge trunk
Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
2012-01-03 17:25:24 +00:00
Yury G. Kudryashov a988b581a0 Add libkvkontakte
svn path=/nixpkgs/trunk/; revision=31240
2012-01-03 16:15:22 +00:00
Eelco Dolstra ab13fb0c34 * Firefox updated to 9.0.1.
svn path=/nixpkgs/trunk/; revision=31236
2012-01-03 15:18:03 +00:00
Lluís Batlle i Rossell 22e91e721e Removing references to openssl 1.0.0e
svn path=/nixpkgs/trunk/; revision=31234
2012-01-03 14:32:41 +00:00
Florian Friesdorf 9e050a9226 iwlwifi-5150-ucode: add Intel 5150 wireless firmware package
Author:    Sergey Mironov <ierton@gmail.com>

svn path=/nixpkgs/trunk/; revision=31232
2012-01-03 14:14:58 +00:00
Yury G. Kudryashov 3af2d4a89e Add kde4.networkmanagement
You still need to start NetworkManager daemon manually to use this widget

svn path=/nixpkgs/trunk/; revision=31229
2012-01-03 13:39:09 +00:00
Yury G. Kudryashov e785aae6e8 Fix most packages depending on fltk
I failed to build cinepaint

svn path=/nixpkgs/trunk/; revision=31224
2012-01-03 10:32:56 +00:00
Yury G. Kudryashov 046ddeb32a fltk-1.3.0
svn path=/nixpkgs/trunk/; revision=31223
2012-01-03 10:02:33 +00:00
Yury G. Kudryashov 995d3d3e03 tulip-3.6.1
svn path=/nixpkgs/trunk/; revision=31216
2012-01-02 18:36:04 +00:00
Peter Simons e195f5b358 monad-control: use consistent naming scheme for all supported versions
svn path=/nixpkgs/trunk/; revision=31211
2012-01-02 14:51:23 +00:00
Yury G. Kudryashov 08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Lluís Batlle i Rossell 7d4e6bbec9 Adding task warrior unstable.
svn path=/nixpkgs/trunk/; revision=31151
2011-12-29 22:27:32 +00:00
Lluís Batlle i Rossell 99e6a23f03 Adding task warrior, stable.
svn path=/nixpkgs/trunk/; revision=31150
2011-12-29 22:14:08 +00:00
Peter Simons de1a6e09d7 haskell-path-pieces: added version 0.1.0
haskell-attoparsec-conduit: added version 0.0.0
haskell-blaze-builder-conduit: added version 0.0.0
haskell-conduit: added version 0.0.0.1
haskell-http-conduit: added version 1.0.0
haskell-lifted-base: added version 0.1.0.2
haskell-xml-conduit: added version 0.5.0
haskell-zlib-conduit: added version 0.0.0

svn path=/nixpkgs/trunk/; revision=31141
2011-12-29 16:42:08 +00:00
Lluís Batlle i Rossell 58af7eb6bf Adding smbldap-tools. And some CPAN packages as bonus.
svn path=/nixpkgs/trunk/; revision=31118
2011-12-27 21:35:50 +00:00
Lluís Batlle i Rossell 9c87cccee9 Adding cgroups to the sheevaplug kernel.
svn path=/nixpkgs/trunk/; revision=31114
2011-12-27 19:33:36 +00:00
Peter Simons 481a96b2ed haskell-shakespeare-i18n: added version 0.0.0
svn path=/nixpkgs/trunk/; revision=31087
2011-12-26 15:35:48 +00:00
Peter Simons 5aacd74bf8 haskell-wai-logger: added version 0.1.1
svn path=/nixpkgs/trunk/; revision=31086
2011-12-26 15:35:42 +00:00
Peter Simons 2d972e96ad haskell-fast-logger: added version 0.0.1
svn path=/nixpkgs/trunk/; revision=31085
2011-12-26 15:35:37 +00:00
Peter Simons e4f3dcda83 haskell-byteorder: added version 1.0.3
svn path=/nixpkgs/trunk/; revision=31084
2011-12-26 15:35:33 +00:00
Peter Simons 70b696e83e haskell-HTTP: added version 4000.2.2
svn path=/nixpkgs/trunk/; revision=31083
2011-12-26 15:35:30 +00:00
Lluís Batlle i Rossell 331d4d13da Trying to make digikam build with boost 1.47 (http://trac.macports.org/ticket/32524),
as it fails with 1.48.


svn path=/nixpkgs/trunk/; revision=31082
2011-12-26 10:13:55 +00:00
Peter Simons 46084dbc3c haskell-repr: added version 0.4.1.2
svn path=/nixpkgs/trunk/; revision=31070
2011-12-25 16:06:17 +00:00
Peter Simons 6a9bbeac0f haskell-string-combinators: added version 0.6.0.2
svn path=/nixpkgs/trunk/; revision=31069
2011-12-25 16:06:11 +00:00
Peter Simons 658f4ae7e2 haskell-dstring: added version 0.4.0.3
svn path=/nixpkgs/trunk/; revision=31068
2011-12-25 16:06:00 +00:00
Yury G. Kudryashov f77741e018 merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +00:00
Andres Löh 8af094c99f Updated ghc HEAD snapshot to ghc-7.4.1-rc1.
svn path=/nixpkgs/trunk/; revision=31066
2011-12-25 00:12:52 +00:00
Yury G. Kudryashov f806eca299 Actually upgrade ntfs-3g
ntfsprogs collection is now part of ntfs-3g

svn path=/nixpkgs/trunk/; revision=31065
2011-12-24 22:28:00 +00:00
Yury G. Kudryashov 6b5dff3bb9 Qt-4.8.0
Hardcode paths to many dlopen()ed libraries. This should fix:
* Print dialog fails to find CUPS;
* flashplugin.
Add optional support for GTK style. Disabled by default.

svn path=/nixpkgs/trunk/; revision=31064
2011-12-24 21:52:08 +00:00
Peter Simons 0ea5780f75 haskell-text: updated use of 0.11.1.11 to 0.11.1.12
svn path=/nixpkgs/trunk/; revision=31061
2011-12-24 18:57:39 +00:00
Peter Simons 986f3c193d pkgs/top-level/haskell-packages.nix: removed inconsistent 'text' specifications in haskell platform expressions
These changes were introduced unintentionally a while ago.

svn path=/nixpkgs/trunk/; revision=31057
2011-12-23 23:34:21 +00:00
Peter Simons e4a2d3ff6d haskell-text: updated version 0.11.1.10 to 0.11.1.11
svn path=/nixpkgs/trunk/; revision=31049
2011-12-23 11:57:45 +00:00
Peter Simons 30afcc3af3 pkgs/top-level/haskell-packages.nix: updated comment about the current HP default version
svn path=/nixpkgs/trunk/; revision=31041
2011-12-22 12:22:52 +00:00
Peter Simons 8854fa0da5 haskell-parallel: updated use of version 3.2.0.0 to 3.2.0.2
svn path=/nixpkgs/trunk/; revision=31030
2011-12-22 12:18:42 +00:00
Peter Simons 53f4402059 haskell-text: updated use of version 0.11.1.9 to 0.11.1.10
svn path=/nixpkgs/trunk/; revision=31029
2011-12-22 12:18:38 +00:00
Russell O'Connor 83452ba0ab adding two versions of metaocaml
svn path=/nixpkgs/trunk/; revision=31026
2011-12-21 21:51:35 +00:00
Eelco Dolstra e1a96b2b88 * Add cpufrequtils to the channel.
svn path=/nixpkgs/trunk/; revision=31017
2011-12-21 16:24:40 +00:00
Peter Simons 3f4358a02a haskell-multirec: dropped obsolete version 0.5.1
svn path=/nixpkgs/trunk/; revision=30999
2011-12-21 10:48:57 +00:00
Eelco Dolstra ed2a67d6d6 * Doh.
svn path=/nixpkgs/trunk/; revision=30998
2011-12-21 10:29:19 +00:00
Peter Simons 331519b7e6 all-packages.nix: append "with-cxx" to the name of gmpxx to ensure that "nix-env -i gmp" prefers this expression
svn path=/nixpkgs/trunk/; revision=30995
2011-12-21 09:28:17 +00:00
Eelco Dolstra 63c643d072 * Firefox 9.0.
svn path=/nixpkgs/trunk/; revision=30985
2011-12-20 14:51:26 +00:00
Shea Levy d54677f9c4 Try to fix the tarball
Not sure if this will work, just tried the obvious fix.

svn path=/nixpkgs/trunk/; revision=30974
2011-12-20 02:51:37 +00:00
Shea Levy ec305ac161 clang builds on darwin now
Also, get rid of the clang bootstrap, there's no need for it

svn path=/nixpkgs/trunk/; revision=30973
2011-12-19 23:58:57 +00:00
Lluís Batlle i Rossell 121a926167 Updating Google Protocol Buffers, and removing an old version because
I think it is unreferenced.


svn path=/nixpkgs/trunk/; revision=30969
2011-12-19 16:03:55 +00:00
Peter Simons c4e802e22d haskell-QuickCheck: added version 2.4.2
svn path=/nixpkgs/trunk/; revision=30961
2011-12-19 13:27:38 +00:00
Peter Simons 4c05021dcb haskell-QuickCheck: dropped obsolete version 2.1.0.3
svn path=/nixpkgs/trunk/; revision=30960
2011-12-19 13:27:35 +00:00
Peter Simons 22bbe11e65 haskell-multirec: updated to version 0.7
svn path=/nixpkgs/trunk/; revision=30959
2011-12-19 13:27:32 +00:00
Shea Levy 006d8dcdc1 clang-3.0
This required moving to the cmake build for llvm in order to build clang
separately from llvm.

svn path=/nixpkgs/trunk/; revision=30956
2011-12-19 12:48:09 +00:00
Shea Levy 0a93e74174 Add beret game
svn path=/nixpkgs/trunk/; revision=30954
2011-12-19 02:13:38 +00:00
Andres Löh ffa89c82fd Trying to fix the build of darcs for ghc-7.0.4.
svn path=/nixpkgs/trunk/; revision=30952
2011-12-18 11:26:46 +00:00