Commit graph

5977 commits

Author SHA1 Message Date
Yury G. Kudryashov f77741e018 merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31067
2011-12-25 05:47:23 +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
Andres Löh e20ab8d9b3 Added Haskell Platform 2011.4.0.0.
svn path=/nixpkgs/trunk/; revision=30951
2011-12-18 10:22:48 +00:00
Florian Friesdorf d8e5cb01b5 pyside-1.0.9
svn path=/nixpkgs/trunk/; revision=30950
2011-12-17 20:16:45 +00:00
Yury G. Kudryashov a670a7aca1 merge trunk
A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
2011-12-16 22:57:21 +00:00
Andres Löh c11749dcd6 Updated the GHC HEAD snapshot.
svn path=/nixpkgs/trunk/; revision=30937
2011-12-16 18:11:23 +00:00
Yury G. Kudryashov f547c64008 Remove unused 'filelight = ...'
svn path=/nixpkgs/trunk/; revision=30931
2011-12-16 10:49:06 +00:00
Yury G. Kudryashov 0971831ddc Reintegrate branches/drop-kde4.5
svn path=/nixpkgs/trunk/; revision=30928
2011-12-16 10:39:22 +00:00
Marco Maggesi b41da3c8df Add ocamlnat (native toplevel for OCaml)
svn path=/nixpkgs/trunk/; revision=30926
2011-12-16 09:35:13 +00:00
Marco Maggesi 9819d7b26a Update OCaml 3.12.0 to 3.12.1
svn path=/nixpkgs/trunk/; revision=30923
2011-12-16 08:11:19 +00:00
Yury G. Kudryashov b077940b3b svn merge https://nixos.org/repos/nix/nixpkgs/trunk
No conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Peter Simons 9e7e3ae89c haskell-network: updated to version 2.3.0.8
svn path=/nixpkgs/trunk/; revision=30908
2011-12-15 13:36:58 +00:00
Peter Simons ba6e0edc9f haskell-syb: updated version 3.x to 0.3.6
svn path=/nixpkgs/trunk/; revision=30907
2011-12-15 13:36:56 +00:00
Cillian de Roiste 02eb690bad Upgrading CouchDB to 1.1.1 with SpiderMonkey 185
svn path=/nixpkgs/trunk/; revision=30905
2011-12-15 12:24:25 +00:00
Cillian de Roiste 47765274e5 Adding SpiderMonkey 185
svn path=/nixpkgs/trunk/; revision=30904
2011-12-15 12:13:36 +00:00
Cillian de Roiste f9cbcf881d Removing trailing whitespace
svn path=/nixpkgs/trunk/; revision=30903
2011-12-15 12:11:54 +00:00
Yury G. Kudryashov 3103799d47 Update dbus and dbus-glib to the latest stable versions
Drop unstable versions

svn path=/nixpkgs/branches/stdenv-updates/; revision=30893
2011-12-14 18:22:34 +00:00
Eelco Dolstra cfde88976b * Streamline the stdenv bootstrap and resulting closure by removing
some redundant builds (e.g., GMP was built three times).
* Updated GMP to 5.0.2.
* Updated PPL to 0.11.2.
* Remove ad hoc flags to build GCC's dependencies statically.
  Instead, use the ‘makeStaticLibraries’ stdenv adapter.
* Build GMP with C++ support by default.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30891
2011-12-14 14:31:56 +00:00
Eelco Dolstra bad4ed8717 * PCRE updated to 8.21. Also enable Unicode support by default, since
it only increases the size of the library a little bit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30886
2011-12-14 13:36:38 +00:00
Andres Löh ea8d3f396e Added zeromq and haskell-zeromq-haskell.
svn path=/nixpkgs/trunk/; revision=30878
2011-12-14 08:31:14 +00:00
Andres Löh 9d19e4fe06 Added haskell-mongoDB and dependencies.
svn path=/nixpkgs/trunk/; revision=30877
2011-12-14 07:57:52 +00:00
Michael Raskin cbd660a83e Oops, forgot to commit
svn path=/nixpkgs/trunk/; revision=30872
2011-12-13 18:53:40 +00:00
Eelco Dolstra da3eea5c9e * util-linux 2.20.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30860
2011-12-12 19:56:17 +00:00
Eelco Dolstra f5fd808b51 * ‘linuxHeaders’ shouldn't use the kernel sources from
‘linuxPackages.kernel’, because then every minor kernel upgrade will
  cause a rebuild of everything.  So fix it at 2.6.35.

svn path=/nixpkgs/branches/stdenv-updates/; revision=30857
2011-12-12 18:51:11 +00:00
Alexander Tsamutali 7e82cfb7d6 Added support for Quake Live to Firefox wrapper.
svn path=/nixpkgs/trunk/; revision=30856
2011-12-12 17:25:51 +00:00
Eelco Dolstra eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Peter Simons f06abc04c5 The EHC compiler is now called UHC.
svn path=/nixpkgs/trunk/; revision=30841
2011-12-11 19:54:40 +00:00
Peter Simons 0f1e1249e7 haskell-packages.nix: xmobar requires parsec 3
Adding this explicit override fixes the GHC 6.10.4 build.

svn path=/nixpkgs/trunk/; revision=30829
2011-12-11 18:01:03 +00:00