Commit graph

2862 commits

Author SHA1 Message Date
Florian Friesdorf dc5e18f626 emacs org mode 7.4 -> 7.5
svn path=/nixpkgs/trunk/; revision=26803
2011-04-12 12:28:37 +00:00
Peter Simons 77f3a10acb ImageMagick: updated to version 6.6.9-4
svn path=/nixpkgs/trunk/; revision=26801
2011-04-12 09:32:31 +00:00
Eelco Dolstra 1c2ba5bcec * Add the Eclipse Modeling Tools.
svn path=/nixpkgs/trunk/; revision=26799
2011-04-12 08:41:53 +00:00
Ludovic Courtès 34011a076a GNU IceCat 4.0: First attempt.
svn path=/nixpkgs/trunk/; revision=26798
2011-04-12 08:12:00 +00:00
Ludovic Courtès 525b04f037 Prepare work on GNU IceCat 4.x.
svn path=/nixpkgs/trunk/; revision=26797
2011-04-12 08:08:39 +00:00
Eelco Dolstra e91e1cfe76 * Eclipse: don't use an ugly "version" argument. Instead there now is
a function "buildEclipse" that takes a binary Eclipse distribution
  plus metadata as arguments.  The package name now distinguishes
  between Eclipse distributions (e.g. "eclipse-sdk" for Classic,
  "eclipse-cpp" for the C/C++ IDE).

svn path=/nixpkgs/trunk/; revision=26787
2011-04-11 20:29:47 +00:00
Eelco Dolstra cdc84bca58 * Thunderbird 3.1.9.
svn path=/nixpkgs/trunk/; revision=26782
2011-04-11 13:41:05 +00:00
Karn Kallio ebdd392409 Advance version of mercurial to 1.8.2
svn path=/nixpkgs/trunk/; revision=26771
2011-04-10 00:50:58 +00:00
Shea Levy 1ee223e3f6 Bump flite to 1.4, move to libraries
svn path=/nixpkgs/trunk/; revision=26759
2011-04-08 16:15:44 +00:00
Karn Kallio 3ce36f7d72 Bump eclipse version to 3.6.2 after 3.6.1 disappeared from source server.
svn path=/nixpkgs/trunk/; revision=26750
2011-04-08 08:06:11 +00:00
Cillian de Roiste 30c1dd27c8 Adding ZynAddSubFX, a software synthesizer, and minixml (a dependency of ZynAddSubFX)
svn path=/nixpkgs/trunk/; revision=26746
2011-04-07 22:24:56 +00:00
Cillian de Roiste c73aed8fd3 Adding vanilla puredata: Real-time graphical programming environment for audio, video, and graphical processing
svn path=/nixpkgs/trunk/; revision=26744
2011-04-07 20:54:33 +00:00
Peter Simons 3f609d2e35 git-annex: updated to version 0.20110401
svn path=/nixpkgs/trunk/; revision=26739
2011-04-07 12:47:17 +00:00
Peter Simons 165f8efdfd git: updated to version 1.7.4.4
svn path=/nixpkgs/trunk/; revision=26738
2011-04-07 12:46:58 +00:00
Eelco Dolstra 5bd074a115 * Install the CA generation script.
svn path=/nixpkgs/trunk/; revision=26734
2011-04-07 09:58:46 +00:00
Evgeny Egorochkin e735de47f3 Fix flash player's runtime deps
svn path=/nixpkgs/trunk/; revision=26730
2011-04-07 09:21:24 +00:00
Lluís Batlle i Rossell 47221a8435 Making giv point to the proper patch file.
svn path=/nixpkgs/trunk/; revision=26723
2011-04-06 15:36:49 +00:00
Eelco Dolstra e9d435a195 svn path=/nixpkgs/trunk/; revision=26720 2011-04-06 15:08:36 +00:00
Lluís Batlle i Rossell 6cfba00e1b Adding giv.
svn path=/nixpkgs/trunk/; revision=26709
2011-04-06 10:00:48 +00:00
Eelco Dolstra 6f297e205a * Subversion updated to 1.6.16.
svn path=/nixpkgs/trunk/; revision=26699
2011-04-05 15:28:25 +00:00
Eelco Dolstra fad57767e3 * Merge the modular-python branch.
svn path=/nixpkgs/trunk/; revision=26695
2011-04-05 15:02:22 +00:00
Russell O'Connor bec1a9c44f update coq to 8.3pl1
update ssreflect to 1.3pl1

svn path=/nixpkgs/trunk/; revision=26692
2011-04-05 11:59:25 +00:00
Eelco Dolstra f99c0dd302 * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26678
2011-04-04 13:36:05 +00:00
Russell O'Connor 2a07e68e9c Upgrade FlashPlayer to version 10.2.153.1
svn path=/nixpkgs/trunk/; revision=26672
2011-04-04 02:34:17 +00:00
Eelco Dolstra 50b8829ce9 * Firefox: don't do --enable-system-cairo for now because it causes
gradients in tabs and other places in the interface to be missing
  (i.e. entirely white).  Should investigate why our own Cairo doesn't
  work properly.

svn path=/nixpkgs/trunk/; revision=26666
2011-04-01 20:28:01 +00:00
Eelco Dolstra e3c03f348e * Slight cleanup.
svn path=/nixpkgs/trunk/; revision=26665
2011-04-01 19:33:03 +00:00
Eelco Dolstra fbfb7714d0 * Apply an upstream patch to prevent dnsmasq from segfaulting due to
bad data from nova-dhcpbridge.

svn path=/nixpkgs/branches/modular-python/; revision=26661
2011-04-01 15:53:37 +00:00
Eelco Dolstra 1f01ba2ce4 * Install nova-api.conf in the right location.
svn path=/nixpkgs/branches/modular-python/; revision=26658
2011-04-01 15:03:48 +00:00
Shea Levy 6cfe0b0a9e Important version bump
svn path=/nixpkgs/trunk/; revision=26657
2011-04-01 14:57:36 +00:00
Eelco Dolstra 50ae7ab689 * Some hackery to get Nova to work.
svn path=/nixpkgs/branches/modular-python/; revision=26628
2011-03-31 13:21:07 +00:00
Lluís Batlle i Rossell 58f7f6e913 Task juggler checks for libjpeg. I add it in case it improves something.
svn path=/nixpkgs/trunk/; revision=26616
2011-03-30 22:08:25 +00:00
Eelco Dolstra cfa011c026 * Getting closer...
svn path=/nixpkgs/branches/modular-python/; revision=26613
2011-03-30 17:04:27 +00:00
Eelco Dolstra 65190277dc * Nova: install the default nova-api.conf and use Boto 1.9 (2.0 doesn't work).
svn path=/nixpkgs/branches/modular-python/; revision=26611
2011-03-30 16:17:25 +00:00
Eelco Dolstra 1d6b63afb9 * openstack-compute -> nova (upstream doesn't know what to call it either).
svn path=/nixpkgs/branches/modular-python/; revision=26610
2011-03-30 15:00:53 +00:00
Eelco Dolstra fc99d84ef2 * Set Nova's state path to /var/lib/nova.
svn path=/nixpkgs/branches/modular-python/; revision=26609
2011-03-30 14:57:51 +00:00
Eelco Dolstra b6126a3a0a * Nova updated to 2011.1.1.
svn path=/nixpkgs/branches/modular-python/; revision=26605
2011-03-30 12:51:16 +00:00
Eelco Dolstra 56ade5fef2 * Remove unused file.
svn path=/nixpkgs/trunk/; revision=26598
2011-03-30 09:43:45 +00:00
Eelco Dolstra 7cec8397c6 * Add some more Nova dependencies: anyjson, amqplib, carrot,
sqlalchemy.  Updated nose to 1.0.0 to fix "make check" on Python
  2.7.

svn path=/nixpkgs/branches/modular-python/; revision=26595
2011-03-29 16:15:08 +00:00
Eelco Dolstra 353d450867 * wrapPythonPrograms: don't hard-code the Python library prefix.
svn path=/nixpkgs/branches/modular-python/; revision=26594
2011-03-29 15:19:59 +00:00
Lluís Batlle i Rossell d73765b161 Making task juggler build.
I also change the nixpkgs attribute name to one I like more.

svn path=/nixpkgs/trunk/; revision=26590
2011-03-29 08:34:12 +00:00
Michael Raskin b89d88cb22 Monotone update: 1.0 release is out
svn path=/nixpkgs/trunk/; revision=26587
2011-03-28 20:26:29 +00:00
Eelco Dolstra 1439ae44be * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26586
2011-03-28 20:22:30 +00:00
Eelco Dolstra c1b64da1c9 * xen: use wrapPython.
svn path=/nixpkgs/branches/modular-python/; revision=26584
2011-03-28 18:12:32 +00:00
Eelco Dolstra 7b3bda471d * keepnote: depend on pythonPackages.sqlite3 rather than pythonFull.
svn path=/nixpkgs/branches/modular-python/; revision=26582
2011-03-28 16:48:31 +00:00
Eelco Dolstra 0a7b7374ac * Bazaar: depend on readline.
svn path=/nixpkgs/branches/modular-python/; revision=26581
2011-03-28 16:48:02 +00:00
Eelco Dolstra 47adaa80e3 * Move the wrapPythonPrograms function into a separate setup hook
(wrapPython).

svn path=/nixpkgs/branches/modular-python/; revision=26580
2011-03-28 16:33:33 +00:00
Lluís Batlle i Rossell 8bf1dd5cef Updating xchm
svn path=/nixpkgs/trunk/; revision=26576
2011-03-28 16:08:26 +00:00
Eelco Dolstra 641834ddf6 * Bazaar: update to 2.3.1.
svn path=/nixpkgs/branches/modular-python/; revision=26573
2011-03-28 15:47:50 +00:00
Eelco Dolstra 83b3ab4657 * Adobe Reader: depend on gdk_pixbuf (from Marc Weber). Also update
to 9.4.2.

svn path=/nixpkgs/trunk/; revision=26572
2011-03-28 15:46:10 +00:00
Eelco Dolstra d449c4db98 * Remove Python 2.6, since the only remaining package that used it
(Calibre) also works with 2.7.

svn path=/nixpkgs/branches/modular-python/; revision=26561
2011-03-28 11:50:47 +00:00
Russell O'Connor 72124a0aa9 Bitcoin.
svn path=/nixpkgs/trunk/; revision=26544
2011-03-27 06:44:34 +00:00
Evgeny Egorochkin 3822bde42e Amarok: version bump
svn path=/nixpkgs/trunk/; revision=26534
2011-03-26 18:23:34 +00:00
Evgeny Egorochkin 7dd8b18baa Flash player: bump
svn path=/nixpkgs/trunk/; revision=26530
2011-03-26 18:18:54 +00:00
Evgeny Egorochkin 94e19387f3 Bangarang: version bump
svn path=/nixpkgs/trunk/; revision=26529
2011-03-26 18:18:49 +00:00
Evgeny Egorochkin bcb0efad3a Quassel: version bump
svn path=/nixpkgs/trunk/; revision=26528
2011-03-26 18:18:45 +00:00
Ludovic Courtès fe5b564e6b Magit: Install to $out.
svn path=/nixpkgs/trunk/; revision=26524
2011-03-26 11:50:01 +00:00
Karn Kallio acf13a9859 Get kdenlive to compile with qt47.
svn path=/nixpkgs/trunk/; revision=26518
2011-03-25 22:40:55 +00:00
Peter Simons 1dbbeeab2c magit: updated to version 1.0.0
svn path=/nixpkgs/trunk/; revision=26515
2011-03-25 12:59:09 +00:00
Ludovic Courtès 37e69af39e GNU Gnash 0.8.9.
svn path=/nixpkgs/trunk/; revision=26498
2011-03-24 22:25:03 +00:00
Eelco Dolstra 9d49bdee78 * Mercurial updated to 1.7.5 (contributed by Vladimír Čunát).
svn path=/nixpkgs/trunk/; revision=26488
2011-03-24 11:47:55 +00:00
Peter Simons b73d1a47ff Grip adjustments: needed ncurses to build
Signed-off-by: Vladimír Čunát <vcunat@gmail.com>

svn path=/nixpkgs/trunk/; revision=26486
2011-03-24 11:45:37 +00:00
Ludovic Courtès cc91f09d6b GNU Zile 2.3.23.
svn path=/nixpkgs/trunk/; revision=26480
2011-03-23 21:55:54 +00:00
Peter Simons 32fea0d8b1 Cosmetic, no functional change intended.
svn path=/nixpkgs/trunk/; revision=26477
2011-03-23 21:05:08 +00:00
Peter Simons 4e6bc23b70 git-annex: patch unpure /usr/bin/perl path in mdwn2man script
svn path=/nixpkgs/trunk/; revision=26476
2011-03-23 21:05:01 +00:00
Peter Simons fd81655bfb topgit: avoid use of "install -D", which doesn't work on FreeBSD
svn path=/nixpkgs/trunk/; revision=26475
2011-03-23 20:32:12 +00:00
Eelco Dolstra 6daacf02e0 * Firefox 3.6.16.
svn path=/nixpkgs/trunk/; revision=26474
2011-03-23 17:50:24 +00:00
Eelco Dolstra 9d2f691ee5 * Add Aangifte 2010.
svn path=/nixpkgs/trunk/; revision=26473
2011-03-23 16:06:36 +00:00
Peter Simons 789f14c0b7 git-annex: added initial version 0.20110320
svn path=/nixpkgs/trunk/; revision=26470
2011-03-23 15:57:53 +00:00
Peter Simons 07d14b9997 Cosmetic, no functional change intended.
svn path=/nixpkgs/trunk/; revision=26464
2011-03-23 10:24:26 +00:00
Peter Simons 3f7ea10694 topgit: updated to version 0.8-45-gd279e29
svn path=/nixpkgs/trunk/; revision=26463
2011-03-23 10:24:22 +00:00
Eelco Dolstra c733c666dc * Remove some unused patches.
svn path=/nixpkgs/trunk/; revision=26461
2011-03-22 14:57:00 +00:00
Eelco Dolstra 73a66cc5e1 * Firefox 4: add --enable-chrome-format=jar to make it run.
svn path=/nixpkgs/trunk/; revision=26459
2011-03-22 14:14:50 +00:00
Eelco Dolstra 0b5a51d95b * Firefox 4.0. Completely untested.
* Removed Firefox 3.5.

svn path=/nixpkgs/trunk/; revision=26457
2011-03-22 13:36:35 +00:00
Lluís Batlle i Rossell df786c07dc Updating gtkwave
svn path=/nixpkgs/trunk/; revision=26454
2011-03-22 11:36:58 +00:00
Eelco Dolstra daff9c4bbf * Add gdk_pixbuf and pam to Chrome's library path.
svn path=/nixpkgs/trunk/; revision=26445
2011-03-21 14:49:36 +00:00
Michael Raskin 9a14edb62f FF 4.0rc2. Still fails to run
svn path=/nixpkgs/trunk/; revision=26435
2011-03-20 19:37:06 +00:00
Russell O'Connor 7e62d8736c upgrading flash player on i686.
svn path=/nixpkgs/trunk/; revision=26432
2011-03-20 16:54:49 +00:00
Michael Raskin 975f93ffc9 Update veracity
svn path=/nixpkgs/trunk/; revision=26414
2011-03-18 08:25:02 +00:00
Michael Raskin 4c8bf75b30 Update Vacuum-IM
svn path=/nixpkgs/trunk/; revision=26413
2011-03-18 08:06:36 +00:00
Michael Raskin 9c5c5b4981 Fix and update urxvt
svn path=/nixpkgs/trunk/; revision=26410
2011-03-18 05:55:37 +00:00
Michael Raskin 0585ca6b8b Adding Firefox-4.0RC1 - fails to start on my notebook currently, though
svn path=/nixpkgs/trunk/; revision=26408
2011-03-17 22:15:53 +00:00
Michael Raskin 39dc794d4a Fix JWM build
svn path=/nixpkgs/trunk/; revision=26404
2011-03-17 19:21:26 +00:00
Lluís Batlle i Rossell 3677d79b63 Removing the dependencies in k3b on cdrkit, cdrdao, dvdrwplustools and
growisofs, because at the end it needs all setuid for it to record anything.

svn path=/nixpkgs/trunk/; revision=26403
2011-03-17 19:02:20 +00:00
Andres Löh c2090d1be3 Added JAGS.
svn path=/nixpkgs/trunk/; revision=26396
2011-03-17 14:45:36 +00:00
Karn Kallio 0c4dbef366 Update mysql Workbench to latest release 5.2.33
Also remove autotools as the tarball is now distributed ready
for configure.

svn path=/nixpkgs/trunk/; revision=26377
2011-03-17 04:18:59 +00:00
Lluís Batlle i Rossell e1dcf1c3df Updating homebank; the previous homebank did not build since the new xorg merge.
svn path=/nixpkgs/trunk/; revision=26353
2011-03-16 10:39:04 +00:00
Eelco Dolstra 2593b6cd6e * Remove bmp, which has been unmaintained and obsolete for > 5 years.
svn path=/nixpkgs/trunk/; revision=26352
2011-03-16 10:37:58 +00:00
Eelco Dolstra b3667a1e8f * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26347
2011-03-16 09:39:40 +00:00
Yury G. Kudryashov a8901903b0 Add akunambol
svn path=/nixpkgs/trunk/; revision=26337
2011-03-15 23:09:33 +00:00
Eelco Dolstra f208edd1a5 * Merge the x-updates branch.
svn path=/nixpkgs/trunk/; revision=26330
2011-03-15 18:29:27 +00:00
Russell O'Connor 22fbb1f3d9 Adding freetype dependency for TeXmacs.
svn path=/nixpkgs/trunk/; revision=26306
2011-03-14 22:03:26 +00:00
Eelco Dolstra 3e3eac2e30 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26303
2011-03-14 18:26:46 +00:00
Eelco Dolstra ea4eb6b5fa * Firefox 3.6.15.
svn path=/nixpkgs/trunk/; revision=26298
2011-03-14 12:25:09 +00:00
Eelco Dolstra 440c82b96f * Fix the ratpoison build (http://hydra.nixos.org/build/915825).
svn path=/nixpkgs/branches/x-updates/; revision=26296
2011-03-14 10:25:26 +00:00
Eelco Dolstra aaecb6430b * Fix Compiz build failure with recent GTK+
(http://hydra.nixos.org/build/955799).

svn path=/nixpkgs/branches/x-updates/; revision=26295
2011-03-14 10:07:33 +00:00
Russell O'Connor 43bed60351 Fix PDF export.
svn path=/nixpkgs/trunk/; revision=26293
2011-03-14 00:04:30 +00:00
Andres Löh 3e0ac9b040 Major Haskell packages overhaul.
Several changes, some highlights:

  * Structure of haskell-packages.nix updated. It's now easier to
    select different default versions of packages for different
    versions of GHC.

  * GHC 7.0.2 is now default.

  * Haskell Platform 2011.2.0.0 has been added and is now default.

  * Several packages have been updated
    (gtk2hs, gitit, xmonad, darcs, ...).

  * Some old packages have been removed.

svn path=/nixpkgs/trunk/; revision=26288
2011-03-12 17:28:15 +00:00
Lluís Batlle i Rossell f17b1273ea Updating k3b, hoping for the settings dialog to work.
svn path=/nixpkgs/trunk/; revision=26286
2011-03-11 20:43:38 +00:00
Lluís Batlle i Rossell d58c5e2821 Adding GMU, a music player for small portable devices, written in SDL.
svn path=/nixpkgs/trunk/; revision=26266
2011-03-10 22:20:35 +00:00
Lluís Batlle i Rossell e7ed35ecd8 Adding the djview firefox plugin option.
svn path=/nixpkgs/trunk/; revision=26265
2011-03-10 21:39:09 +00:00
Ludovic Courtès 1ddb8e3f44 GNU TeXmacs 1.0.7.10.
svn path=/nixpkgs/trunk/; revision=26258
2011-03-10 14:53:56 +00:00
Ludovic Courtès 7e8149bf87 GNU Emacs 23.3.
svn path=/nixpkgs/trunk/; revision=26255
2011-03-10 14:53:41 +00:00
Ludovic Courtès 38d4789236 GNU Zile 2.3.22.
svn path=/nixpkgs/trunk/; revision=26253
2011-03-10 14:53:30 +00:00
Ludovic Courtès ebc8c668b7 GNU IceCat 3.6.15.
svn path=/nixpkgs/trunk/; revision=26251
2011-03-10 14:53:17 +00:00
Michael Raskin 039e45f584 Update LyX
svn path=/nixpkgs/trunk/; revision=26248
2011-03-10 13:07:47 +00:00
Eelco Dolstra cc3d1e1c09 * Sync with trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26243
2011-03-10 08:48:14 +00:00
Lluís Batlle i Rossell 19d1236a52 Updating feh
svn path=/nixpkgs/trunk/; revision=26229
2011-03-09 13:37:03 +00:00
Lluís Batlle i Rossell 134c00b471 Fixing the build of awesome with cmake 2.8.4.
svn path=/nixpkgs/trunk/; revision=26207
2011-03-08 14:07:11 +00:00
Eelco Dolstra d10651a8b7 * zOMG, a new Pan release!
* Delete gmime 2.2.x because the old version of Pan was the only
  package that needed it.

svn path=/nixpkgs/trunk/; revision=26200
2011-03-07 17:11:50 +00:00
Eelco Dolstra f16a2dc2f6 * Sync with the trunk. Remove glib_2_28 because the branch already
has it.

svn path=/nixpkgs/branches/x-updates/; revision=26189
2011-03-07 12:17:12 +00:00
Lluís Batlle i Rossell e132efaeeb Fixing the freecad build on i686-linux
svn path=/nixpkgs/trunk/; revision=26173
2011-03-06 11:00:29 +00:00
Lluís Batlle i Rossell 874af6794d Trying to get freecad work on i686-linux too.
svn path=/nixpkgs/trunk/; revision=26170
2011-03-05 22:27:55 +00:00
Lluís Batlle i Rossell 69a67fc7cf Trying to make freecad find pyqt. This required a patch to be able to use PYTHONPATH.
svn path=/nixpkgs/trunk/; revision=26169
2011-03-05 22:27:51 +00:00
Lluís Batlle i Rossell 370a89b5ad Removing the wrong pyqt references in freecad. I don't know how to make it work with pyqt still.
svn path=/nixpkgs/trunk/; revision=26154
2011-03-04 09:48:36 +00:00
Lluís Batlle i Rossell f6ea68b2ee Freecad builds, installs and runs, (although still not with PyQt for its draft workbench).
On virtualgl, it needs a variable set about the GL context set; freecad
suggests that upon failing to run in that environment.

svn path=/nixpkgs/trunk/; revision=26153
2011-03-04 09:48:33 +00:00
Lluís Batlle i Rossell a76b0fb6fa Making freecad install; it still does not find all shared objects though.
Either eigen changed the hash of the tarball, or I did not commit its latest hash.
I add boost 1.46 apart, because 1.44 does not work easily for freecad.

svn path=/nixpkgs/trunk/; revision=26151
2011-03-04 09:48:24 +00:00
Lluís Batlle i Rossell 5c5170ae88 Updating fossil
svn path=/nixpkgs/trunk/; revision=26150
2011-03-03 16:23:59 +00:00
Lluís Batlle i Rossell 60844f7488 Making freecad build (from svn version). It does not install still, though.
svn path=/nixpkgs/trunk/; revision=26145
2011-03-03 13:41:10 +00:00
Eelco Dolstra 2f848503b9 svn path=/nixpkgs/trunk/; revision=26142 2011-03-03 12:07:51 +00:00
Eelco Dolstra eb4b1e8b04 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26141
2011-03-03 12:02:50 +00:00
Lluís Batlle i Rossell d11c00e5a5 Adding xercesc, the references to coin3d and soqt, and trying to add
freecad (that still does not build).

svn path=/nixpkgs/trunk/; revision=26135
2011-03-02 17:18:30 +00:00
Michael Raskin e5e98b9984 Updating veracity; adding parts of needed infrastructure for tests. Currently, a test run would fail
svn path=/nixpkgs/trunk/; revision=26126
2011-02-28 20:56:01 +00:00
David Guibert f54652ea56 ledger: update to 2.6.3.
svn path=/nixpkgs/trunk/; revision=26109
2011-02-24 22:19:47 +00:00
David Guibert ecf72a5720 git: 1.7.4 -> 1.7.4.1
svn path=/nixpkgs/trunk/; revision=26107
2011-02-24 22:19:37 +00:00
David Guibert 67dae3543f update chrome
svn path=/nixpkgs/trunk/; revision=26106
2011-02-24 22:19:32 +00:00
Peter Simons 3c2ba9df1a Dropped file that was checked in by accident.
Thanks, Ludo, for catching this mistake.

svn path=/nixpkgs/trunk/; revision=26102
2011-02-24 18:08:16 +00:00
Eelco Dolstra 60e9fc7991 * Fix a typo in the `platforms' attribute.
svn path=/nixpkgs/trunk/; revision=26100
2011-02-24 16:24:54 +00:00
Peter Simons f073bf2a3e esniper 2.24.0 is a simple, lightweight tool for sniping eBay auctions.
svn path=/nixpkgs/trunk/; revision=26086
2011-02-24 11:25:16 +00:00
Ludovic Courtès 2fafe4612c GNU IceCat 3.6.13.
svn path=/nixpkgs/trunk/; revision=26080
2011-02-23 17:36:36 +00:00
Eelco Dolstra d47cf5a35e * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26054
2011-02-22 10:00:18 +00:00
Eelco Dolstra d89d26cdd2 * Added OpenStack Compute (Nova). It builds but doesn't work yet.
svn path=/nixpkgs/trunk/; revision=26047
2011-02-21 21:53:42 +00:00
Karn Kallio e443f99bed Advance mysql workbench to version 5.2.31a
Also add python binary to wrapper PATH prefix to guarantee the
application will use a deterministic python version.

svn path=/nixpkgs/trunk/; revision=26038
2011-02-19 23:45:04 +00:00
Eelco Dolstra d6c6f9f0e0 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26018
2011-02-17 16:33:39 +00:00
Eelco Dolstra 3e89e6ad89 * Thunderbird 3.1.7.
svn path=/nixpkgs/trunk/; revision=26011
2011-02-17 13:30:00 +00:00
Eelco Dolstra 7d44982534 * icewm: explicitly link against fontconfig.
svn path=/nixpkgs/branches/x-updates/; revision=26008
2011-02-17 11:51:29 +00:00
Eelco Dolstra a9633d80de * Emacs: don't depend on dbus on non-Linux platforms.
svn path=/nixpkgs/branches/x-updates/; revision=26007
2011-02-17 10:17:49 +00:00
Eelco Dolstra 9b6dfe840a * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=25993
2011-02-16 15:14:04 +00:00
Eelco Dolstra 2e81976a34 * Apply xlib.patch to go-oo as well.
svn path=/nixpkgs/branches/x-updates/; revision=25985
2011-02-16 09:18:07 +00:00
Eelco Dolstra 4ac97e16b6 * Fix an OpenOffice build problem (http://hydra.nixos.org/build/911291).
Not tested.

svn path=/nixpkgs/branches/x-updates/; revision=25983
2011-02-15 16:06:33 +00:00
Eelco Dolstra 070f7debe0 * gdk-pixbuf: build gdk-pixbuf-xlib.
svn path=/nixpkgs/branches/x-updates/; revision=25961
2011-02-14 13:44:01 +00:00
Eelco Dolstra 5f85d4c19c * slim: update to 1.3.2.
svn path=/nixpkgs/branches/x-updates/; revision=25951
2011-02-14 10:15:48 +00:00
Eelco Dolstra 8c58edf34d * xterm: fix build and update to version 268.
svn path=/nixpkgs/branches/x-updates/; revision=25949
2011-02-14 10:09:01 +00:00
Florian Friesdorf 5526aa13e8 notmuch-0.5 -> notmuch-0.5-20110203 (git)
svn path=/nixpkgs/trunk/; revision=25946
2011-02-14 05:01:33 +00:00
Eelco Dolstra 5042a81534 * Fix broken icons such as the back/forward buttons in Firefox.
svn path=/nixpkgs/branches/x-updates/; revision=25944
2011-02-13 23:38:28 +00:00
Yury G. Kudryashov 5e7c026c22 kde-x.y/utils is for kdeutils-x.y.z, not for apps from kde-apps.org
svn path=/nixpkgs/trunk/; revision=25932
2011-02-13 04:34:37 +00:00
Florian Friesdorf 4b603776af notmuch-0.5 build successful
svn path=/nixpkgs/trunk/; revision=25931
2011-02-13 01:56:32 +00:00
Florian Friesdorf f03892655b notmuch -- The mail indexer
configure fails so far:
Checking for Xapian development files... Yes (1.0.23).
Checking for GMime development files... No.
Checking for talloc development files... No.
Checking for valgrind development files... No (but that's fine).
Checking if emacs is available... Yes.

svn path=/nixpkgs/trunk/; revision=25930
2011-02-13 01:34:49 +00:00
Lluís Batlle i Rossell af7a77aca6 Mumble builds
svn path=/nixpkgs/trunk/; revision=25927
2011-02-12 20:31:25 +00:00
David Guibert ed85acac61 fix mkvtoolnix description and homepage
svn path=/nixpkgs/trunk/; revision=25926
2011-02-12 20:22:55 +00:00
David Guibert 87418d034b mkvtoolnix: 4.4.0
svn path=/nixpkgs/trunk/; revision=25925
2011-02-12 20:18:53 +00:00
Cillian de Roiste 36c45a06dd Updating chromium, I've added myself as a maintainer since I'm happy to keep it updated in the future
svn path=/nixpkgs/trunk/; revision=25921
2011-02-12 18:47:28 +00:00
Lluís Batlle i Rossell cb41a67c47 Building mumble a bit further.
svn path=/nixpkgs/trunk/; revision=25908
2011-02-11 15:56:29 +00:00
Eelco Dolstra 3c0dc22e91 * x86_64-linux requires -fPIC.
svn path=/nixpkgs/trunk/; revision=25893
2011-02-11 11:26:40 +00:00
Eelco Dolstra 4ddf706a2f * New adventures in purity: get Spotify to work without a
/usr/share/spotify symlink by rewriting open() and stat() calls.

svn path=/nixpkgs/trunk/; revision=25892
2011-02-11 11:16:18 +00:00
Lluís Batlle i Rossell 951b65cf9c Trying to add mumble. It still does not build.
svn path=/nixpkgs/trunk/; revision=25890
2011-02-10 19:23:27 +00:00
Yury G. Kudryashov f909b550dd vlc-1.1.5, much more dependencies
svn path=/nixpkgs/trunk/; revision=25872
2011-02-09 21:11:30 +00:00
Eelco Dolstra 38c109a395 * Google Earth 6.0.1.2032.
svn path=/nixpkgs/trunk/; revision=25842
2011-02-09 13:33:46 +00:00
Michael Raskin 662fa0a13b Fix updated maxima build
svn path=/nixpkgs/trunk/; revision=25799
2011-02-08 10:35:58 +00:00
Peter Simons e0d871ba91 maxima: added buildInput 'texinfo' so that the reference documentation can be built
svn path=/nixpkgs/trunk/; revision=25797
2011-02-07 17:37:22 +00:00
Peter Simons 7795e5ec24 pkgs/applications/science/math/wxmaxima/default.nix: fixed the sha256 checksum
svn path=/nixpkgs/trunk/; revision=25796
2011-02-07 14:49:25 +00:00
Peter Simons 80c344d0cf pkgs/applications/science/math/maxima: fixed the sha256 checksum
svn path=/nixpkgs/trunk/; revision=25795
2011-02-07 14:47:42 +00:00
Peter Simons 0c3dcddbf3 pkgs/applications/science/math/wxmaxima: updated to version 0.8.7
svn path=/nixpkgs/trunk/; revision=25787
2011-02-07 11:35:42 +00:00
Peter Simons a4cf1b8456 pkgs/applications/science/math/maxima: updated to version 5.23.2
svn path=/nixpkgs/trunk/; revision=25786
2011-02-07 11:35:35 +00:00
Lluís Batlle i Rossell 16d91fa949 Tell hydra to build audacity.
svn path=/nixpkgs/trunk/; revision=25780
2011-02-05 21:08:12 +00:00
Michael Raskin 596dca28d3 Update Veracity to 0.5.7
svn path=/nixpkgs/trunk/; revision=25775
2011-02-04 16:58:47 +00:00
Russell O'Connor 7748f89d86 Bump TeXmacs to verion 1.0.7.9.
svn path=/nixpkgs/trunk/; revision=25770
2011-02-03 16:23:05 +00:00
David Guibert a45d06f7fb Merge commit 'f54c97b' into HEAD
svn path=/nixpkgs/trunk/; revision=25768
2011-02-02 20:05:47 +00:00
Peter Simons 7689a5d7a7 pkgs/applications/window-managers/ratpoison: added dependency on perl, which is required by rpws
svn path=/nixpkgs/trunk/; revision=25761
2011-02-02 13:58:18 +00:00
Peter Simons 4262167be0 pkgs/applications/version-management/git-and-tools/git: fixed git gui module
Patch Tcl/Tk scripts to invoke 'wish' using the complete executable path to
ensure that the proper version is being used.

svn path=/nixpkgs/trunk/; revision=25755
2011-02-02 11:16:57 +00:00
Michael Raskin 03c08712bd Update XNeur
svn path=/nixpkgs/trunk/; revision=25745
2011-02-02 07:11:18 +00:00
David Guibert ad3a08ef1c update virtualboxGuestAdditions to 4.0.2
svn path=/nixpkgs/trunk/; revision=25744
2011-02-02 06:54:57 +00:00
David Guibert 5ba7793e33 new makeself: 2.1.5
svn path=/nixpkgs/trunk/; revision=25743
2011-02-01 23:24:13 +00:00
David Guibert 7544a6399f virtualbox: 3.2.10 -> 4.0.2
The upgrade is needed to compile virtualbox
with kernel 2.6.37.

svn path=/nixpkgs/trunk/; revision=25735
2011-01-31 09:42:48 +00:00
David Guibert b67c47cb3f git: 1.7.3.5 -> 1.7.4
svn path=/nixpkgs/trunk/; revision=25732
2011-01-31 09:42:37 +00:00
Piotr Pietraszkiewicz 2b81894a3c dynamic likner finds the libX11.so again
svn path=/nixpkgs/trunk/; revision=25710
2011-01-27 23:49:00 +00:00
Piotr Pietraszkiewicz 59e243b062 made kadu compilable again on x86-64 NixOS platform
svn path=/nixpkgs/trunk/; revision=25709
2011-01-27 23:45:06 +00:00
Eelco Dolstra 2985218698 * xpdf 3.02pl5.
svn path=/nixpkgs/trunk/; revision=25688
2011-01-25 13:28:23 +00:00
Cillian de Roiste ce45e043e4 Adding redshift; it changes the color temperature of your screen gradually to match the lighting conditions
svn path=/nixpkgs/trunk/; revision=25686
2011-01-24 23:52:22 +00:00
Lluís Batlle i Rossell 07b89a3fbb Adding offrss
svn path=/nixpkgs/trunk/; revision=25672
2011-01-23 16:40:25 +00:00
Lluís Batlle i Rossell 53ceebc3d3 Updating awesome (patch by Carles Pagès)
svn path=/nixpkgs/trunk/; revision=25652
2011-01-21 08:24:41 +00:00
Yury G. Kudryashov e115e9a725 Be more verbose
svn path=/nixpkgs/trunk/; revision=25650
2011-01-21 08:23:31 +00:00
Lluís Batlle i Rossell 594c0a8ff9 Updating meld (patch by Carles Pagès)
svn path=/nixpkgs/trunk/; revision=25647
2011-01-20 22:07:49 +00:00
Lluís Batlle i Rossell 954561a02d pjsua needs the libgcc
svn path=/nixpkgs/trunk/; revision=25633
2011-01-19 21:16:40 +00:00
Eelco Dolstra 3e3dc422ac * Allow geeqie to find exiv2 and exiftran, necessary to losslessly
rotate JPEG images.

svn path=/nixpkgs/trunk/; revision=25590
2011-01-16 16:42:08 +00:00
Eelco Dolstra 56ea89a61e * And now an actual fix.
svn path=/nixpkgs/trunk/; revision=25589
2011-01-16 16:39:06 +00:00
Eelco Dolstra dbb8c452bb * fbida: fix a segfault in exiftran.
svn path=/nixpkgs/trunk/; revision=25588
2011-01-16 16:28:08 +00:00
Lluís Batlle i Rossell 40012b3588 Making pjsip install the console User Agent (pjsua), that helps a lot testing SIP.
svn path=/nixpkgs/trunk/; revision=25587
2011-01-16 14:58:37 +00:00
Lluís Batlle i Rossell b8e6a6ef5a Adding siproxd
svn path=/nixpkgs/trunk/; revision=25584
2011-01-16 11:41:19 +00:00
Ludovic Courtès 14f45d5da4 Add GNU Ocrad.
svn path=/nixpkgs/trunk/; revision=25572
2011-01-14 21:44:43 +00:00
Michael Raskin 0d57a6b2f7 Update Veracity
svn path=/nixpkgs/trunk/; revision=25571
2011-01-14 20:23:32 +00:00
Eelco Dolstra 4a5824721a * The expression `builtins.substring 5 10 perl.name' barfs if
`perl.name' evaluates to "perl" (since there are not enough
  characters in the string).  It's better to use
  builtins.parseDrvName.

svn path=/nixpkgs/trunk/; revision=25559
2011-01-14 12:37:26 +00:00
Michael Raskin f3afe5cd08 Adding virt-viewer
svn path=/nixpkgs/trunk/; revision=25548
2011-01-13 22:30:32 +00:00
Lluís Batlle i Rossell 3c282f5a31 Adding linphone
svn path=/nixpkgs/trunk/; revision=25545
2011-01-13 20:49:58 +00:00
Armijn Hemel e6e51b2d83 update to 2.7.9
svn path=/nixpkgs/trunk/; revision=25544
2011-01-13 18:47:46 +00:00
Lluís Batlle i Rossell 2ae2385f26 Updating fossil
svn path=/nixpkgs/trunk/; revision=25532
2011-01-13 09:23:43 +00:00
Lluís Batlle i Rossell 971e6c9233 Adding pjsip (pjproject-1.8)
svn path=/nixpkgs/trunk/; revision=25531
2011-01-13 09:23:40 +00:00
Ludovic Courtès 7c88378532 Org 7.4.
svn path=/nixpkgs/trunk/; revision=25484
2011-01-10 09:55:28 +00:00
Michael Raskin ed3ce17ce1 Adding darktable photo editor. Patch by Cillian de Róiste ( goibhniu1 )
svn path=/nixpkgs/trunk/; revision=25462
2011-01-08 21:55:33 +00:00
Peter Simons e6e6f033ec pkgs/applications/version-management/git-and-tools/git: cosmetic changes to improve consistency
No functional change is intended.

svn path=/nixpkgs/trunk/; revision=25456
2011-01-07 11:04:09 +00:00
Peter Simons d0f409e009 pkgs/applications/version-management/git-and-tools/git: be verbose when creating symlinks
The postInstall hook replaces identical copies of the same files in $out with
symlinks. This patch changes the call to 'ln' to pass the '-v' flag so that we
can see in the build log which files were replaced.

svn path=/nixpkgs/trunk/; revision=25455
2011-01-07 11:04:04 +00:00
Peter Simons f989b670d6 pkgs/applications/version-management/git-and-tools/git: fixed the build to deal with names that contain whitespace
The "find -print | while read" loop failed to deal with paths that contain
whitespace. Instead, we now use a similar construct that's based on globbing.

svn path=/nixpkgs/trunk/; revision=25454
2011-01-07 11:03:57 +00:00
Peter Simons 167f185411 pkgs/applications/version-management/git-and-tools/git: fixed "git gui"
The git-gui module cannot be wrapped like gitk, because the Tcl implementation
uses the program's basename to determine stuff like the name of the Window it
opens, etc., and it cannot deal with a program name that contain a dot, like
".git-gui-wrapped" did.

Instead of wrapping git-gui, it's now patched to execute 'wish' with a complete
store path.

While I was at it, I also applied this solution to git-gui--askpass.

svn path=/nixpkgs/trunk/; revision=25453
2011-01-07 11:03:42 +00:00
Eelco Dolstra def604cc62 * Spotify: add the 32-bit version and provide a longDescription.
svn path=/nixpkgs/trunk/; revision=25436
2011-01-06 10:17:18 +00:00
Peter Simons 922bb7657c pkgs/applications/version-management/git-and-tools/git: updated to version 1.7.3.5
svn path=/nixpkgs/trunk/; revision=25435
2011-01-06 10:04:21 +00:00
Eelco Dolstra f81bc24790 * Spotify for Linux (preview version). It works, but not yet out of
the box because it requires /usr/share/spotify to point at its
  resources.  So to get it to work, you should do something like:

  $ nix-env -i spotify
  $ mkdir -p /usr/share
  $ ln -s /home/eelco/.nix-profile/share/spotify /usr/share/

  Also note that the Linux client doesn't work with free Spotify
  accounts (as noted on
  https://www.spotify.com/nl/download/previews/).

svn path=/nixpkgs/trunk/; revision=25431
2011-01-05 23:23:22 +00:00
Ludovic Courtès 7f157c0f33 Remove the old experimental BitlBee-OTR.
svn path=/nixpkgs/trunk/; revision=25420
2011-01-05 10:48:25 +00:00
Ludovic Courtès ea13b1e2e3 BitlBee 3.0.1.
svn path=/nixpkgs/trunk/; revision=25419
2011-01-05 10:48:21 +00:00
Eelco Dolstra 9d792e7316 * Mercurial: always build with HTTPS support.
svn path=/nixpkgs/branches/modular-python/; revision=25395
2011-01-04 16:44:38 +00:00
Lluís Batlle i Rossell 3aa2bdbab5 Making unison build to byte code in armv5tel. I also fix the build with enableX11 I think.
svn path=/nixpkgs/trunk/; revision=25373
2011-01-03 20:52:49 +00:00
Yury G. Kudryashov 5e11179828 Fix krita compilation with exiv-0.21 (upstream patch)
svn path=/nixpkgs/trunk/; revision=25370
2011-01-03 19:05:15 +00:00
Lluís Batlle i Rossell ed9a70e40e Allowing unison without X.
svn path=/nixpkgs/trunk/; revision=25369
2011-01-03 18:43:16 +00:00
Marco Maggesi 436e1d72a7 * Coq: fix compilation of coqide (path to lablgkt)
svn path=/nixpkgs/trunk/; revision=25360
2011-01-03 13:49:15 +00:00
Lluís Batlle i Rossell cdf7db3301 Updating fossil
svn path=/nixpkgs/trunk/; revision=25358
2011-01-03 10:56:09 +00:00
Alexander Tsamutali 0397273877 applications/networking/browsers/conkeror: Updated to 0.9.3.
svn path=/nixpkgs/trunk/; revision=25357
2011-01-03 09:57:35 +00:00
Evgeny Egorochkin 0de601dc7a chromium: bump. Patch by Cillian de Róiste.
svn path=/nixpkgs/trunk/; revision=25356
2011-01-03 00:33:14 +00:00
Evgeny Egorochkin 2f46958f67 amarok-live: packaged
svn path=/nixpkgs/trunk/; revision=25355
2011-01-03 00:02:20 +00:00
Alexander Tsamutali 25c7d51515 applications/networking/p2p/transmission: Updated to 2.13.
svn path=/nixpkgs/trunk/; revision=25348
2011-01-02 20:09:25 +00:00
Evgeny Egorochkin 056394c0f2 VirtualBox: cleanup
svn path=/nixpkgs/trunk/; revision=25347
2011-01-02 19:37:13 +00:00
Russell O'Connor b46d1d2e07 Updating Ktorrent to the latest.
svn path=/nixpkgs/trunk/; revision=25346
2011-01-02 19:06:45 +00:00
Evgeny Egorochkin dc16cd8995 VirtualBox: version bump and compilation fix.
svn path=/nixpkgs/trunk/; revision=25344
2011-01-02 18:43:27 +00:00
Michael Raskin 820a66152b Fix lablgtk reference
svn path=/nixpkgs/trunk/; revision=25343
2011-01-02 17:34:19 +00:00
Michael Raskin ca29aa026f Fix lablgtk reference
svn path=/nixpkgs/trunk/; revision=25342
2011-01-02 17:28:42 +00:00
Michael Raskin e55aa52856 Fix lablgtk reference
svn path=/nixpkgs/trunk/; revision=25341
2011-01-02 17:25:18 +00:00
Michael Raskin d2b277fbd5 Try fixing Audacity
svn path=/nixpkgs/trunk/; revision=25340
2011-01-02 17:13:34 +00:00
Michael Raskin c2df70227c Updating veracity
svn path=/nixpkgs/trunk/; revision=25332
2011-01-02 09:27:09 +00:00
Russell O'Connor 88ec92d14c Matita and its dependencies.
svn path=/nixpkgs/trunk/; revision=25328
2010-12-31 17:48:55 +00:00
Alexander Tsamutali d3bb1b2630 applications/misc/xmobar: Updated to 0.12.
svn path=/nixpkgs/trunk/; revision=25327
2010-12-30 22:36:46 +00:00
Michael Raskin cc30a2861c Adding freetalk
svn path=/nixpkgs/trunk/; revision=25323
2010-12-29 19:20:55 +00:00
Eelco Dolstra cb843de402 * Audacious updated to 2.4.2.
svn path=/nixpkgs/trunk/; revision=25319
2010-12-29 10:39:41 +00:00
Eelco Dolstra 762ed9079f * Merged the stdenv-updated branch. Woohoo!
svn path=/nixpkgs/trunk/; revision=25315
2010-12-28 21:19:57 +00:00
Lluís Batlle i Rossell 4c16325de0 I take out getPkgConfig. It looks to me as if it needed a solution, but noone took action.
I take action before much discussion.
For what I see:
- getPkgConfig problems are hard to track
- config.nix trying to forecast getPkgConfig behaviour looks me as a bad approach,
  and people should not trust such a config.nix unless they parsed the whole nixpkgs
  for tricky effects.
- It's not that hard to write config.nix in the style of getConfig
- Every now and then newcomers hit the "'git' is an attribute set while a boolean was expected".

Maybe this will disrupt nixes of some people, and that will be a background on what to discuss.


svn path=/nixpkgs/trunk/; revision=25314
2010-12-28 21:07:35 +00:00
Yury G. Kudryashov 302d783310 Make filelight compile with gcc-4.5
svn path=/nixpkgs/branches/stdenv-updates/; revision=25313
2010-12-28 18:47:57 +00:00
Eelco Dolstra aa6f43149a * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25308
2010-12-28 16:42:00 +00:00
Alexander Tsamutali b2ac724cd6 xmonad-contrib: Now depends on X11Xft.
svn path=/nixpkgs/trunk/; revision=25299
2010-12-27 20:50:27 +00:00
Eelco Dolstra 90f485f268 * MPlayer updated to the latest SVN snapshot.
* MPlayer: add VDPAU support.

svn path=/nixpkgs/branches/stdenv-updates/; revision=25297
2010-12-27 18:48:16 +00:00
Marco Maggesi 51d6c8df91 * Handle variable createFindlibDestdir correctly in ocaml-findlib
* Fix HOL Light derivation

svn path=/nixpkgs/trunk/; revision=25269
2010-12-23 19:28:06 +00:00
Eelco Dolstra 4837b70d27 * Restore MPlayer's default font. This got lost somewhere.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25260
2010-12-23 17:07:07 +00:00
Armijn Hemel ce6b26042d update to 2.7.8
svn path=/nixpkgs/trunk/; revision=25257
2010-12-23 13:56:04 +00:00
Eelco Dolstra 770ca317ba * Get Xen to build with GCC 4.5 and Glibc 2.12.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25247
2010-12-22 19:38:26 +00:00
Eelco Dolstra c14382cb45 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25225
2010-12-21 15:14:33 +00:00
Michael Raskin 955f9c19a6 Update Veracity
svn path=/nixpkgs/trunk/; revision=25218
2010-12-21 05:21:54 +00:00
Evgeny Egorochkin 9b4c2f5f56 Emacs PHP mode: packaged. Patch by Karn Kallio.
svn path=/nixpkgs/trunk/; revision=25216
2010-12-21 04:40:38 +00:00
Eelco Dolstra f0b62c77a9 * Adobe Reader 9.4.
svn path=/nixpkgs/trunk/; revision=25208
2010-12-20 12:14:58 +00:00
Marco Maggesi e7accaf8d3 * Update camlp5
svn path=/nixpkgs/trunk/; revision=25206
2010-12-20 10:32:22 +00:00
Lluís Batlle i Rossell 22253677b3 Merging from trunk. The previous merge took the firefox 3.6 in a bad state.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25202
2010-12-19 20:12:10 +00:00
Karn Kallio c04f8e236c Bump kmplayer to latest release 0.11.2.c
This also fixes build failure related to docbook versions.

svn path=/nixpkgs/trunk/; revision=25190
2010-12-17 23:18:21 +00:00
Lluís Batlle i Rossell b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Karn Kallio a3947a1605 Finish removing all patches.
svn path=/nixpkgs/trunk/; revision=25187
2010-12-17 20:34:29 +00:00
Karn Kallio a6f1f87697 Upstream reports bug has been fixed
https://bugzilla.mozilla.org/show_bug.cgi?id=551152
and the patch did not cleanly apply.

svn path=/nixpkgs/trunk/; revision=25186
2010-12-17 20:28:51 +00:00
Ludovic Courtès e60ba9135a SimGrid 3.5.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25180
2010-12-17 17:48:12 +00:00