Commit graph

4799 commits

Author SHA1 Message Date
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
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
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
Lluís Batlle i Rossell daf8abbc24 Alphabet, and its order...
svn path=/nixpkgs/trunk/; revision=30816
2011-12-09 21:18:09 +00:00
Lluís Batlle i Rossell 4a6af291a3 Adding btar 0.9!
svn path=/nixpkgs/trunk/; revision=30815
2011-12-09 21:15:41 +00:00
Karn Kallio 5088162de4 Add config option to sane for hotplugSupport.
Default value of true prevents builds on non i686 due to assert.

svn path=/nixpkgs/trunk/; revision=30798
2011-12-08 02:55:40 +00:00
Piotr Pietraszkiewicz 1bd85e4159 added libdvbpsi and added it to the dependency list of vlc so that vlc can play DVB
svn path=/nixpkgs/trunk/; revision=30789
2011-12-06 23:09:19 +00:00
Piotr Pietraszkiewicz 4ad898b4d6 added dvb-apps
svn path=/nixpkgs/trunk/; revision=30787
2011-12-06 23:00:46 +00:00
Peter Simons 06a72fa57c log4cplus: added version 1.0.4
svn path=/nixpkgs/trunk/; revision=30777
2011-12-06 15:05:57 +00:00
Ludovic Courtès d0151a7465 hwloc 1.3.
svn path=/nixpkgs/trunk/; revision=30771
2011-12-06 14:04:01 +00:00
Shea Levy 1be13f458f Apply mornfall's SANE patches
Fix sane-backends to generate udev rules, add a snapshot of sane-backends's unstable repo, and add a SANE nixos module

svn path=/nixpkgs/trunk/; revision=30764
2011-12-05 17:32:45 +00:00
Karn Kallio 19cad6e711 fix error: undefined variable 'llvmSVN'
svn path=/nixpkgs/trunk/; revision=30736
2011-12-05 09:30:33 +00:00
Shea Levy 9943b8da03 Remove llvmSVN, it's outdated and doesn't work
svn path=/nixpkgs/trunk/; revision=30732
2011-12-05 02:53:26 +00:00
Shea Levy 69e12ad16e Add ncmpcpp
Patch by mornfall

svn path=/nixpkgs/trunk/; revision=30730
2011-12-05 01:32:25 +00:00
Ludovic Courtès b7833639ba Seeks 0.4.0.
svn path=/nixpkgs/trunk/; revision=30729
2011-12-04 22:03:03 +00:00
Ludovic Courtès 2585033ca6 Add Tokyo-Tyrant, the network interface to Tokyo-Cabinet.
svn path=/nixpkgs/trunk/; revision=30728
2011-12-04 22:02:55 +00:00
Ludovic Courtès dccc3f83b3 GNUnet 0.9.0.
svn path=/nixpkgs/trunk/; revision=30725
2011-12-04 13:49:03 +00:00
Shea Levy 3de62cd12a Add quvi
Patch submitted by mornfall

svn path=/nixpkgs/trunk/; revision=30720
2011-12-03 22:21:00 +00:00
Lluís Batlle i Rossell 0160f222cc Adding flashplayer11. It builds fine for me on x86_64.
Patch by Eduard Carreras.


svn path=/nixpkgs/trunk/; revision=30712
2011-12-03 15:16:17 +00:00
Ludovic Courtès 57b602b5ae Remove GNU IceCat 4, which never built.
svn path=/nixpkgs/trunk/; revision=30660
2011-12-01 22:43:17 +00:00
Ludovic Courtès 6aa48df3d2 Hydra: Comment out for now.
svn path=/nixpkgs/trunk/; revision=30659
2011-12-01 22:43:10 +00:00
Ludovic Courtès 46d3cd449f Samba: Add a cross-compilable variant.
svn path=/nixpkgs/trunk/; revision=30627
2011-11-29 22:54:00 +00:00
Eelco Dolstra 752203c3ca * Remove broken tux-on-ice kernels.
svn path=/nixpkgs/trunk/; revision=30619
2011-11-29 14:49:32 +00:00
Karn Kallio 96e436d6a3 Opa does not compile with ocaml before version 3.12.0
svn path=/nixpkgs/trunk/; revision=30584
2011-11-28 15:52:46 +00:00
Karn Kallio 9ac48a630e Add OPA to Nixpkgs.
svn path=/nixpkgs/trunk/; revision=30578
2011-11-27 23:58:46 +00:00
Marco Maggesi 8d4b5bcd0c Upgrade camlp5 to version 6.02.3-1 (contributed by Russell O'Connor).
Keep the old version 5.15 to allow a smooth migration.


svn path=/nixpkgs/trunk/; revision=30575
2011-11-26 19:39:14 +00:00
Russell O'Connor a31ff3d009 Forgot to add picosat to the all-packages.nix in revision 29869. Now I'm adding it.
svn path=/nixpkgs/trunk/; revision=30554
2011-11-24 19:53:42 +00:00
Russell O'Connor c9b2f32c45 Updating bitcoin to version 0.5.0.
svn path=/nixpkgs/trunk/; revision=30553
2011-11-24 19:48:20 +00:00
Russell O'Connor 845f2a8658 adding camlp5 as a propogated build input to ulex 0.8
matita and ulex must build against the same version of camlp5, so in an attempt to force them to always be the same I am adding a propgatedBuildInput to ulex.
Granted Matita still requires camlp5_traditional and this is less obvious in the matita file now, so I am not entirely sure this is the right design choice.

svn path=/nixpkgs/trunk/; revision=30552
2011-11-24 19:43:03 +00:00
Eelco Dolstra b9214d9c8c * Move libcgroup from libcg/ to libcgroup/.
svn path=/nixpkgs/trunk/; revision=30547
2011-11-24 13:48:16 +00:00
Eelco Dolstra 7a7fb5bc5a * Firefox 8.0.1.
* Make Firefox 8 the default.

svn path=/nixpkgs/trunk/; revision=30546
2011-11-24 11:55:15 +00:00
Karn Kallio 67653f93fa Wesnoth does not build with boost 1.48
svn path=/nixpkgs/trunk/; revision=30521
2011-11-22 06:13:18 +00:00
Karn Kallio 2ef1290de3 koffice does not build with boost 1.48; use 1.47 instead.
svn path=/nixpkgs/trunk/; revision=30520
2011-11-22 04:38:14 +00:00
Eelco Dolstra 5abed12234 * i386-sunos -> i686-solaris.
svn path=/nixpkgs/trunk/; revision=30507
2011-11-21 14:11:04 +00:00