philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
%!d() commits 3 branches 0 tags 1.4 GiB
Commit graph

1122 commits

Author SHA1 Message Date
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
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 a856742950 torchat: tell Hydra that it shouldn't attempt to build that package an Cygwin (fails with an assertion) 
svn path=/nixpkgs/trunk/; revision=30833
 2011-12-11 18:35:20 +00:00
Piotr Pietraszkiewicz 6cb70eea88 upgraded to kadu-0.10.1 
svn path=/nixpkgs/trunk/; revision=30781
 2011-12-06 19:11:15 +00:00
Ludovic Courtès dccc3f83b3 GNUnet 0.9.0. 
svn path=/nixpkgs/trunk/; revision=30725
 2011-12-04 13:49:03 +00:00
Peter Simons 72e5c8176e rsync: stripped trailing whitespace 
svn path=/nixpkgs/trunk/; revision=30715
 2011-12-03 16:11:57 +00:00
Peter Simons 74d6145917 rsync: added meta.maintainers section 
svn path=/nixpkgs/trunk/; revision=30714
 2011-12-03 16:11:54 +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
Lluís Batlle i Rossell b330b79160 Updating rsync. 
svn path=/nixpkgs/trunk/; revision=30707
 2011-12-02 23:14:09 +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
Eelco Dolstra a7b50dc5de * Do an "exec" to get rid of an unnecessary shell. 
svn path=/nixpkgs/trunk/; revision=30566
 2011-11-25 17:01:54 +00:00
Eelco Dolstra ec390f4bbb * Fix incorrect URL. 
svn path=/nixpkgs/trunk/; revision=30548
 2011-11-24 14:22:13 +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
Florian Friesdorf 50bfde368e notmuch use license path instead of string 
svn path=/nixpkgs/trunk/; revision=30498
 2011-11-20 21:49:06 +00:00
Florian Friesdorf b555892dff notmuch-0.9 
svn path=/nixpkgs/trunk/; revision=30491
 2011-11-20 19:22:53 +00:00
Evgeny Egorochkin 351ff3583d TorChat: packaged 
svn path=/nixpkgs/trunk/; revision=30480
 2011-11-19 17:12:00 +00:00
Rob Vermaas a456047fc1 update chrome 
svn path=/nixpkgs/trunk/; revision=30462
 2011-11-18 02:40:33 +00:00
Peter Simons 1a4f43c7b3 wireshark: updated to version 1.6.2 
svn path=/nixpkgs/trunk/; revision=30426
 2011-11-14 15:11:23 +00:00
Lluís Batlle i Rossell 45388a9ae1 Updating aMSN. 
svn path=/nixpkgs/trunk/; revision=30420
 2011-11-14 09:59:26 +00:00
Michael Raskin 94149403e5 Firefox 9.0beta1 
svn path=/nixpkgs/trunk/; revision=30391
 2011-11-12 09:38:31 +00:00
Eelco Dolstra c8da189d39 * Added Firefox 8.0. 
* Removed Firefox 6.

svn path=/nixpkgs/trunk/; revision=30382
 2011-11-10 23:06:58 +00:00
Peter Simons 368ac01473 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
 2011-11-08 10:18:35 +00:00
Peter Simons dd8a7b38db esniper: fixed build with current version of curl 
svn path=/nixpkgs/trunk/; revision=30299
 2011-11-07 17:48:51 +00:00
Lluís Batlle i Rossell c95d373b68 Patching gtmess; it did not build on arm. 
svn path=/nixpkgs/trunk/; revision=30230
 2011-11-04 18:10:44 +00:00
Lluís Batlle i Rossell 6d9179983b Semicolon 
svn path=/nixpkgs/trunk/; revision=30222
 2011-11-04 10:35:21 +00:00
Lluís Batlle i Rossell 0f0ca48a8d Adding gtmess 
svn path=/nixpkgs/trunk/; revision=30221
 2011-11-04 10:28:18 +00:00
Peter Simons 69488d688d synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30186
 2011-11-02 10:28:32 +00:00
Shea Levy 3447d62e64 pidgin-sipe: Bump to 1.12.0 
svn path=/nixpkgs/trunk/; revision=30177
 2011-11-02 00:19:19 +00:00
Peter Simons dfd063cf12 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=30027
 2011-10-26 09:15:25 +00:00
Shea Levy 892889cf35 Add netperf 
I will add meta later, I promise, I just need to use this now

svn path=/nixpkgs/trunk/; revision=30026
 2011-10-25 20:49:22 +00:00
Lluís Batlle i Rossell b74d8fb90f Making gpgme optional in mutt. A dependency of gpgme (pth) does not build on arm. 
svn path=/nixpkgs/trunk/; revision=30019
 2011-10-25 17:46:26 +00:00
Lluís Batlle i Rossell f71f99ce48 Updating mldonkey 
svn path=/nixpkgs/trunk/; revision=29998
 2011-10-24 19:03:18 +00:00
Eelco Dolstra 8f76df522e * 32-bit Flash player updated. 
svn path=/nixpkgs/trunk/; revision=29951
 2011-10-20 23:11:13 +00:00
Sander van der Burg 9ee72eb9ae Added license to yafc 
svn path=/nixpkgs/trunk/; revision=29930
 2011-10-20 11:17:24 +00:00
Peter Simons 8dfef0f4a0 synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29851
 2011-10-14 22:06:50 +00:00
Florian Friesdorf d2b089cc0b notmuch - simplify expression 
svn path=/nixpkgs/trunk/; revision=29834
 2011-10-14 10:30:14 +00:00
Peter Simons e3984c2caf synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29739
 2011-10-10 17:01:17 +00:00
Yury G. Kudryashov c35c6ec9fa Drop 'gnomevfs = gnome_vfs;' alias 
s/gnomevfs/gnome_vfs/ in packages

svn path=/nixpkgs/trunk/; revision=29718
 2011-10-08 12:06:03 +00:00
Eelco Dolstra 79ab307dd7 * Fix Chatzilla (it doesn't work with recent Xulrunners). 
* Get rid of xulrunnerWrapper.

svn path=/nixpkgs/trunk/; revision=29706
 2011-10-07 09:26:03 +00:00
Eelco Dolstra f1dcb1ccd0 * Thunderbird: install a desktop item. 
svn path=/nixpkgs/trunk/; revision=29703
 2011-10-06 14:10:56 +00:00
Eelco Dolstra ee74cf87dc * Set the Chrome icon in its desktop item. 
svn path=/nixpkgs/trunk/; revision=29701
 2011-10-06 13:52:54 +00:00
Eelco Dolstra 57f482e2c3 * Get rid of old Thunderbird versions. 
svn path=/nixpkgs/trunk/; revision=29700
 2011-10-06 13:28:03 +00:00
Eelco Dolstra f4d88c2197 * Thunderbird 7.0.1. 
svn path=/nixpkgs/trunk/; revision=29697
 2011-10-06 13:21:05 +00:00
Peter Simons 1add4b2e6d synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29696
 2011-10-06 13:16:47 +00:00
Eelco Dolstra bcf053ed23 * Firefox 7.0.1. 
svn path=/nixpkgs/trunk/; revision=29687
 2011-10-06 10:47:09 +00:00
Shea Levy 3b260bfbf7 Merge from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29553
 2011-10-01 18:12:00 +00:00
Michael Raskin a8a3ede5e9 Adding Firefox 8.0beta1 
svn path=/nixpkgs/trunk/; revision=29549
 2011-09-30 15:44:22 +00:00
Michael Raskin 8e02768459 Firefox 7.0 release 
svn path=/nixpkgs/trunk/; revision=29544
 2011-09-30 07:10:47 +00:00
Peter Simons e460e459bf synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29531
 2011-09-28 19:26:00 +00:00
Yury G. Kudryashov e2c4af0946 Update opera to the latest version 
Also add missing dependencies (KDE, cups, gstreamer)

svn path=/nixpkgs/trunk/; revision=29527
 2011-09-28 15:23:28 +00:00
Peter Simons 07a5a121fb synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29524
 2011-09-28 14:48:34 +00:00
Shea Levy 790d78fb6f FreeRDP-unstable: Bump 
svn path=/nixpkgs/trunk/; revision=29522
 2011-09-28 14:23:47 +00:00
Shea Levy 01df54f5cc Merge from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
 2011-09-23 16:58:45 +00:00
Michael Raskin 8e6bbd66aa Update LinuxDC++. Does not eliminate some of the strange segfaults 
svn path=/nixpkgs/trunk/; revision=29449
 2011-09-23 06:52:10 +00:00
Lluís Batlle i Rossell 1175e3e46b Adding etherape, although it wants those gconf things I think. 
svn path=/nixpkgs/trunk/; revision=29437
 2011-09-22 09:19:33 +00:00
Lluís Batlle i Rossell d7d6755654 Updating gnunet 0.9 svn version, although it brings little or nothing new I had noticed. 
svn path=/nixpkgs/trunk/; revision=29436
 2011-09-22 09:15:48 +00:00
Shea Levy 514e07ba96 Update freerdpUnstable 
svn path=/nixpkgs/trunk/; revision=29432
 2011-09-22 02:07:49 +00:00
Florian Friesdorf 12a38dd5c6 notmuch-0.8 all tests pass 
svn path=/nixpkgs/trunk/; revision=29427
 2011-09-21 20:04:43 +00:00
Lluís Batlle i Rossell c289ea7c4f Making rsync cross build. 
svn path=/nixpkgs/trunk/; revision=29408
 2011-09-21 07:04:22 +00:00
Eelco Dolstra 267e123508 * Latest Tribler. 
svn path=/nixpkgs/trunk/; revision=29396
 2011-09-20 11:20:15 +00:00
Piotr Pietraszkiewicz e0111c4232 kadu-0.10.0 (forgotten commit) 
svn path=/nixpkgs/trunk/; revision=29371
 2011-09-19 22:05:06 +00:00
Piotr Pietraszkiewicz a1680bc96b kadu-0.10.0 
svn path=/nixpkgs/trunk/; revision=29370
 2011-09-19 22:04:03 +00:00
Alexander Tsamutali ebe4a3501c applications/networking/browsers/conkeror: Updated to 1.0pre-20110917. 
svn path=/nixpkgs/trunk/; revision=29329
 2011-09-17 20:05:03 +00:00
Alexander Tsamutali 820e9ee753 applications/networking/browsers/firefox/6.0.nix: Fix building on Linux 3.x. 
svn path=/nixpkgs/trunk/; revision=29328
 2011-09-17 19:19:45 +00:00
Lluís Batlle i Rossell 98f6452a70 Adding the gnunet 0.9 (svn), which works incompatible with the latest gnunet released. 
I updated some libs to get it built.


svn path=/nixpkgs/trunk/; revision=29313
 2011-09-16 20:50:24 +00:00
Eelco Dolstra 6cec6f29db * Use the -O flag. 
svn path=/nixpkgs/trunk/; revision=29288
 2011-09-14 22:54:35 +00:00
Piotr Pietraszkiewicz 44a7252405 made myself a maintainer of kadu 
svn path=/nixpkgs/trunk/; revision=29259
 2011-09-13 20:54:02 +00:00
Eelco Dolstra 6a73467eac * Chromium updated to the latest version. Because Chromium now used 
Gold, this requires a new patchelf.
* Changed the package name from ‘chrome’ to ‘chromium’.

svn path=/nixpkgs/trunk/; revision=29197
 2011-09-11 20:48:02 +00:00
Eelco Dolstra a2b2ad5782 * Firefox 6.0.2. 
svn path=/nixpkgs/trunk/; revision=29079
 2011-09-07 15:13:00 +00:00
Shea Levy 5c8d585216 Argh, the hash given by nix-prefetch-git is unusable in fetchgit 
svn path=/nixpkgs/trunk/; revision=29074
 2011-09-07 04:11:33 +00:00
Shea Levy 53b10cac36 FreeRDP just migrated their github servers. Also, bump revs while we're at it 
svn path=/nixpkgs/trunk/; revision=29073
 2011-09-07 03:55:09 +00:00
Shea Levy c3dff03d1a freerdp: Add meta information 
svn path=/nixpkgs/trunk/; revision=29071
 2011-09-07 03:42:23 +00:00
Shea Levy 93be0770d7 Add unstable version of freerdp 
svn path=/nixpkgs/trunk/; revision=29070
 2011-09-07 03:41:18 +00:00
Shea Levy 84e3e287c3 Add freerdp 
svn path=/nixpkgs/trunk/; revision=29068
 2011-09-06 23:32:01 +00:00
Nicolas Pierron 51ccaadce3 Thunderbird 5.x: Add Linux as a build platform. 
svn path=/nixpkgs/trunk/; revision=29019
 2011-09-05 08:33:07 +00:00
Russell O'Connor c128803d11 upgrading 32-bit flashplayer to version 10.3.183.7 
svn path=/nixpkgs/trunk/; revision=28987
 2011-09-02 19:25:46 +00:00
Eelco Dolstra c084ef2f61 * The latest and greatest Tribler. 
svn path=/nixpkgs/trunk/; revision=28971
 2011-09-02 11:11:48 +00:00
Michael Raskin cd68b91a4f Update Vacuum 
svn path=/nixpkgs/trunk/; revision=28948
 2011-09-01 06:15:12 +00:00
Eelco Dolstra a4993d3b23 * Firefox 6.0.1, 3.6.21. 
svn path=/nixpkgs/trunk/; revision=28937
 2011-08-31 09:12:56 +00:00
Nicolas Pierron 6e9492d7fd Fix mozilla urls. 
svn path=/nixpkgs/trunk/; revision=28850
 2011-08-27 15:29:13 +00:00
Eelco Dolstra f823626fd8 * Get Firefox 6.0 to build with an upstream patch for building Firefox 
separately from Xulrunner
  (https://bugzilla.mozilla.org/show_bug.cgi?id=639554).

svn path=/nixpkgs/trunk/; revision=28846
 2011-08-27 13:44:36 +00:00
Yury G. Kudryashov 597412252a Wrap kde-related packages in kdePackagesFor 
This lets hydra build kde packages for all available KDE releases.
Will commit NixOS-fix in a few minutes.

svn path=/nixpkgs/trunk/; revision=28833
 2011-08-26 13:49:23 +00:00
Michael Raskin 9c87acf5ab Update Google Talk source. I wonder if there is a way to get it with a fixed version.. 
svn path=/nixpkgs/trunk/; revision=28830
 2011-08-26 11:21:56 +00:00
Yury G. Kudryashov f1362ffb93 Another merge miss 
svn path=/nixpkgs/branches/stdenv-updates/; revision=28795
 2011-08-24 20:22:23 +00:00
Shea Levy 4d70ba6cc9 Merge from trunk up through r28790 
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
 2011-08-24 19:16:43 +00:00
Michael Raskin b23809b118 Adding Firefox 7.0beta1 - with a hack for Linux 3.0 build, but unlike 6.0 it does work afterwards 
svn path=/nixpkgs/trunk/; revision=28732
 2011-08-22 06:54:03 +00:00
Nicolas Pierron 2defa3e715 Follow Mozilla homepages migrations. (.com -> .org) 
svn path=/nixpkgs/trunk/; revision=28722
 2011-08-21 15:44:53 +00:00
Nicolas Pierron bb2716d232 Fix Thunderbird 5.0: Add missing patch of the build system. 
svn path=/nixpkgs/trunk/; revision=28713
 2011-08-20 14:47:24 +00:00
Nicolas Pierron 1738fca385 Add Thunderbird 5.0. 
svn path=/nixpkgs/trunk/; revision=28710
 2011-08-20 14:30:09 +00:00
Yury G. Kudryashov 0b669505c2 linphone-3.4.3 
svn path=/nixpkgs/trunk/; revision=28655
 2011-08-18 12:52:41 +00:00
Michael Raskin a3a46ada24 Adding Firefox 6.0. Mozilla says it is seamless upgrade from 5.0, so I am trying not to change anything... 
svn path=/nixpkgs/trunk/; revision=28625
 2011-08-16 21:53:43 +00:00
Eelco Dolstra 822dd05d1d * Update 32-bit Flash Player. 
svn path=/nixpkgs/trunk/; revision=28624
 2011-08-16 21:32:48 +00:00
Yury G. Kudryashov fdd58b2de4 rekonq-0.7.0, remove unused source.nix 
svn path=/nixpkgs/trunk/; revision=28602
 2011-08-15 23:39:05 +00:00
Eelco Dolstra 529a3a31f9 * Removed Firefox 4 (obsolete). 
svn path=/nixpkgs/trunk/; revision=28531
 2011-08-13 12:20:49 +00:00
Eelco Dolstra fa1433ec8b * Fix SSL support in Chrome. It dynamically tries to open 
libnssckbi.so (which contains the root certificates), so that
  library has to be in LD_LIBRARY_PATH.

svn path=/nixpkgs/trunk/; revision=28519
 2011-08-12 16:45:17 +00:00
Peter Simons 70f794471f esniper: updated to version 2.26.0 
svn path=/nixpkgs/trunk/; revision=28452
 2011-08-10 08:12:58 +00:00
David Guibert 065c0213cf gnome-mplayer, gnome-mediamplayer updated to 1.0.4 
svn path=/nixpkgs/trunk/; revision=28445
 2011-08-09 20:39:43 +00:00
Yury G. Kudryashov a9daa0c0cb mutt-1.5.21; enable pop, imap and gpgme 
openssl.patch is already merged in this version

svn path=/nixpkgs/trunk/; revision=28441
 2011-08-09 20:21:05 +00:00
David Guibert 7de614fdf3 pidgin 2.9.0 
svn path=/nixpkgs/trunk/; revision=28425
 2011-08-09 12:35:55 +00:00
Karn Kallio a233ebf891 Switch to forward compatibility of kde45 on kde_baseapps. 
svn path=/nixpkgs/trunk/; revision=28217
 2011-08-07 01:45:26 +00:00
Eelco Dolstra 18509c88b3 * KTorrent updated to 4.1.1. 
svn path=/nixpkgs/trunk/; revision=28193
 2011-08-06 14:28:15 +00:00
Karn Kallio 514407c726 Repair kadu to get it building again. 
svn path=/nixpkgs/trunk/; revision=28160
 2011-08-04 21:04:19 +00:00
Piotr Pietraszkiewicz 8d546fbdb8 upgraded kadu to v0.9.2 + fixed typos in description 
svn path=/nixpkgs/trunk/; revision=28143
 2011-08-03 18:36:56 +00:00
Eelco Dolstra 23e9cfac65 * Build Skype with PulseAudio support. This is needed on 64-bit 
NixOS because it doesn't provide a 32-bit ALSA/Pulse module.

svn path=/nixpkgs/trunk/; revision=28123
 2011-08-02 15:55:55 +00:00
Shea Levy 7233051b2c rdesktop: Bump to 1.7.0 
svn path=/nixpkgs/trunk/; revision=28119
 2011-08-02 00:19:29 +00:00
Ludovic Courtès e7349f4329 BitlBee 3.0.3. 
svn path=/nixpkgs/trunk/; revision=27985
 2011-07-28 12:08:08 +00:00
Lluís Batlle i Rossell 22135b319b Updating skype. It runs fine (start, see the friends list) for me. 
svn path=/nixpkgs/trunk/; revision=27973
 2011-07-27 16:07:20 +00:00
Lluís Batlle i Rossell 1d3c534625 Updating unison. 
svn path=/nixpkgs/trunk/; revision=27893
 2011-07-21 21:46:06 +00:00
Lluís Batlle i Rossell 2758c07f1e Updating mldonkey. I remove the patch needed for mips, as they put it upstream already. 
svn path=/nixpkgs/trunk/; revision=27885
 2011-07-21 18:34:41 +00:00
Eelco Dolstra b70a14f88c * Added the Google Talk plugin. Doesn't work yet (says ‘ABORT: 
X_GLXCreateContext: BadValue’).

svn path=/nixpkgs/trunk/; revision=27825
 2011-07-18 14:44:28 +00:00
Eelco Dolstra 7bef513d8a * Update Flashplayer on i686-linux. 
svn path=/nixpkgs/trunk/; revision=27738
 2011-07-12 13:44:56 +00:00
Eelco Dolstra 43e046af45 * Firefox 5.0.1. 
svn path=/nixpkgs/trunk/; revision=27731
 2011-07-12 06:34:27 +00:00
Eelco Dolstra 5a7ffcd82d * Firefox: use external SQLite and Cairo. 
svn path=/nixpkgs/trunk/; revision=27602
 2011-07-04 15:35:53 +00:00
Eelco Dolstra 684186104c * Latest SQLite, Flash player (Vladimír Čunát). 
svn path=/nixpkgs/trunk/; revision=27595
 2011-07-04 14:12:20 +00:00
Eelco Dolstra bdf034862b * Make Firefox 5.0 the default. 
svn path=/nixpkgs/trunk/; revision=27593
 2011-07-04 14:04:43 +00:00
Lluís Batlle i Rossell b8a6d84910 Updating offrss. 
svn path=/nixpkgs/trunk/; revision=27561
 2011-06-29 22:33:42 +00:00
Michael Raskin a0d97d5eb2 Adding OneTeam XMPP client 
svn path=/nixpkgs/trunk/; revision=27553
 2011-06-28 09:45:09 +00:00
Lluís Batlle i Rossell 1229dd1400 Adding a still broken restroshare expression. I'll develop further later. 
svn path=/nixpkgs/trunk/; revision=27540
 2011-06-26 17:57:28 +00:00
Eelco Dolstra 2e8c66c1d3 * Pan updated to 0.135. 
svn path=/nixpkgs/trunk/; revision=27518
 2011-06-22 17:57:32 +00:00
Eelco Dolstra 611aecaeeb * Firefox 5.0. 
* nspr updated to 4.8.8.

svn path=/nixpkgs/trunk/; revision=27516
 2011-06-22 12:21:15 +00:00
Michael Raskin 023f15e484 Adding Firefox 5.0 RC1 
svn path=/nixpkgs/trunk/; revision=27478
 2011-06-16 08:08:10 +00:00
Florian Friesdorf 3de8406dd3 chrome 88807 - 64bit install works, i686 untested 
svn path=/nixpkgs/trunk/; revision=27437
 2011-06-13 20:42:09 +00:00
Alexander Tsamutali a93499aeb7 applications/networking/browsers/conkeror: Updated to 0.9.3-20110606. 
svn path=/nixpkgs/trunk/; revision=27436
 2011-06-13 19:10:18 +00:00
Alexander Tsamutali 2daeebaaec applications/networking/p2p/transmission: Updated to 2.31. 
svn path=/nixpkgs/trunk/; revision=27433
 2011-06-13 14:15:15 +00:00
Peter Simons 8d931c2771 esniper: updated to version 2.25.0 
svn path=/nixpkgs/trunk/; revision=27346
 2011-06-05 18:38:33 +00:00
Ludovic Courtès f86a5587d7 GNU IceCat 4.0.1.1. 
svn path=/nixpkgs/trunk/; revision=27322
 2011-05-30 21:49:06 +00:00
Michael Raskin e0a4f988a4 Make Ekiga build 
svn path=/nixpkgs/trunk/; revision=27305
 2011-05-27 05:39:44 +00:00
Eelco Dolstra 8310876955 * Update Flash player on i686-linux. 
svn path=/nixpkgs/trunk/; revision=27278
 2011-05-18 16:24:02 +00:00
Florian Friesdorf ea0bf27906 notmuch-0.6-rc4 
svn path=/nixpkgs/trunk/; revision=27217
 2011-05-11 10:33:01 +00:00
Cillian de Roiste 1dfe9e22d4 Adding optional JACK support for mumble, this also disables ALSA and OSS because this combination is reported to be unstable 
svn path=/nixpkgs/trunk/; revision=27206
 2011-05-10 07:07:35 +00:00
Florian Friesdorf 09dcd78f88 notmuch-0.6-rc1 
svn path=/nixpkgs/trunk/; revision=27173
 2011-05-06 21:07:48 +00:00
Eelco Dolstra a423840c66 * Use a working version of Tribler. 
svn path=/nixpkgs/trunk/; revision=27148
 2011-05-04 14:59:17 +00:00
Eelco Dolstra 7a62283c46 svn path=/nixpkgs/trunk/; revision=27128 2011-05-04 08:55:30 +00:00
Eelco Dolstra 9afa230dfc * Added Tribler. Doesn't quite work yet. 
svn path=/nixpkgs/trunk/; revision=27124
 2011-05-03 17:12:31 +00:00
Eelco Dolstra 89e94123c6 * Move ktorrent to pkgs/applications/networking/p2p/. 
svn path=/nixpkgs/trunk/; revision=27123
 2011-05-03 16:59:24 +00:00
Eelco Dolstra 077fd0a77c * Firefox updated to 4.0.1. Dropped the libvpx dependency because it 
was ignored anyway.  With the --with-system-libvpx flag, the build
  barfs with:

    checking for vpx/vpx_decoder.h... yes
    configure: error: vpx/vpx_decoder.h found, but is not in /usr/include

svn path=/nixpkgs/trunk/; revision=27089
 2011-05-02 11:53:11 +00:00
Lluís Batlle i Rossell f793bd3683 Updating offrss 
svn path=/nixpkgs/trunk/; revision=27076
 2011-05-01 19:57:31 +00:00
Eelco Dolstra 2f34f27f8a * w3m updated to 0.5.3. 
svn path=/nixpkgs/trunk/; revision=27058
 2011-04-30 09:20:59 +00:00
Ludovic Courtès 270ea3beec Elinks: Fix libgc initialization. 
svn path=/nixpkgs/trunk/; revision=27046
 2011-04-28 21:22:24 +00:00
Cillian de Roiste 300456b2c8 Updating the revision to get a working download url 
svn path=/nixpkgs/trunk/; revision=27031
 2011-04-28 13:12:26 +00:00
Florian Friesdorf ead24cacdf notmuch: -inheritable-tags-hack +atomic-new 
svn path=/nixpkgs/trunk/; revision=26983
 2011-04-27 02:54:57 +00:00
Florian Friesdorf 805a6f0713 notmuch: rebased and merged feature branches on current master 
https://github.com/chaoflow/notmuch/commits/cfl8

svn path=/nixpkgs/trunk/; revision=26981
 2011-04-26 20:57:21 +00:00
Florian Friesdorf fea4178205 notmuch: fixed all tests except one 
svn path=/nixpkgs/trunk/; revision=26881
 2011-04-18 17:19:54 +00:00
Florian Friesdorf eb5ecfcb56 notmuch: patch to solve unexpected output in emacs frontend 
svn path=/nixpkgs/trunk/; revision=26880
 2011-04-18 17:19:51 +00:00
Florian Friesdorf 5c73dfdc1a notmuch: newer crypto patches - still failing tests, but mostly usable 
svn path=/nixpkgs/trunk/; revision=26879
 2011-04-18 17:19:48 +00:00
Florian Friesdorf bd71b36628 notmuch with inheritable-tags-hack for thread muting 
the muted tag is supposed to be inherited by messages of the same
thread, effictely muting a thread. A muted thread will not show up in
your inbox anymore. Current implementation is hackish but functional.

big thank you to amdragon!

svn path=/nixpkgs/trunk/; revision=26878
 2011-04-18 17:19:44 +00:00
Michael Raskin 5bc01b1093 Fix glib networking system update 
svn path=/nixpkgs/trunk/; revision=26870
 2011-04-17 17:56:01 +00:00
Nicolas Pierron d53592905e mumble: Add an install phase to move files to a bin directory. 
svn path=/nixpkgs/trunk/; revision=26861
 2011-04-17 08:27:04 +00:00
Lluís Batlle i Rossell e4351e6df0 Fixing the nixpkgs tarball, broken for more than a week. 
svn path=/nixpkgs/trunk/; revision=26856
 2011-04-16 16:27:55 +00:00
Michael Raskin ffaf0fb9ff Update Gecko-mediaplayer 
svn path=/nixpkgs/trunk/; revision=26844
 2011-04-14 11:33:10 +00:00
Michael Raskin 6c133d03f6 Pidgin needs libgcrypt for GNUTLS 
svn path=/nixpkgs/trunk/; revision=26819
 2011-04-13 10:03:07 +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 cdc84bca58 * Thunderbird 3.1.9. 
svn path=/nixpkgs/trunk/; revision=26782
 2011-04-11 13:41:05 +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
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 56ade5fef2 * Remove unused file. 
svn path=/nixpkgs/trunk/; revision=26598
 2011-03-30 09:43:45 +00:00
Evgeny Egorochkin 7dd8b18baa Flash player: bump 
svn path=/nixpkgs/trunk/; revision=26530
 2011-03-26 18:18:54 +00:00
Evgeny Egorochkin bcb0efad3a Quassel: version bump 
svn path=/nixpkgs/trunk/; revision=26528
 2011-03-26 18:18:45 +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 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
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 4c8bf75b30 Update Vacuum-IM 
svn path=/nixpkgs/trunk/; revision=26413
 2011-03-18 08:06:36 +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
Yury G. Kudryashov a8901903b0 Add akunambol 
svn path=/nixpkgs/trunk/; revision=26337
 2011-03-15 23:09:33 +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
Ludovic Courtès ebc8c668b7 GNU IceCat 3.6.15. 
svn path=/nixpkgs/trunk/; revision=26251
 2011-03-10 14:53:17 +00:00
Eelco Dolstra cc3d1e1c09 * Sync with trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=26243
 2011-03-10 08:48:14 +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
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
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 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 9b6dfe840a * Sync with the trunk. 
svn path=/nixpkgs/branches/x-updates/; revision=25993
 2011-02-16 15:14:04 +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
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
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
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
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
Lluís Batlle i Rossell 07b89a3fbb Adding offrss 
svn path=/nixpkgs/trunk/; revision=25672
 2011-01-23 16:40:25 +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 954561a02d pjsua needs the libgcc 
svn path=/nixpkgs/trunk/; revision=25633
 2011-01-19 21:16:40 +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
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 971e6c9233 Adding pjsip (pjproject-1.8) 
svn path=/nixpkgs/trunk/; revision=25531
 2011-01-13 09:23:40 +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
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
Lluís Batlle i Rossell ed9a70e40e Allowing unison without X. 
svn path=/nixpkgs/trunk/; revision=25369
 2011-01-03 18:43:16 +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
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
Russell O'Connor b46d1d2e07 Updating Ktorrent to the latest. 
svn path=/nixpkgs/trunk/; revision=25346
 2011-01-02 19:06:45 +00:00
Michael Raskin 820a66152b Fix lablgtk reference 
svn path=/nixpkgs/trunk/; revision=25343
 2011-01-02 17:34:19 +00:00
Michael Raskin cc30a2861c Adding freetalk 
svn path=/nixpkgs/trunk/; revision=25323
 2010-12-29 19:20:55 +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
Armijn Hemel ce6b26042d update to 2.7.8 
svn path=/nixpkgs/trunk/; revision=25257
 2010-12-23 13:56:04 +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
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
Eelco Dolstra 24dd283b0a * Firefox 3.6.13. 
svn path=/nixpkgs/trunk/; revision=25170
 2010-12-17 11:44:18 +00:00
Michael Raskin da5fd5c100 Fix Opera update 
svn path=/nixpkgs/trunk/; revision=25134
 2010-12-14 20:32:49 +00:00
Michael Raskin 24640ac0ec Update Opera 
svn path=/nixpkgs/trunk/; revision=25130
 2010-12-14 15:56:22 +00:00
Lluís Batlle i Rossell ee04ffcb55 Updating from trunk. I resolved simple conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
 2010-12-11 12:47:00 +00:00
Lluís Batlle i Rossell ebe1ebaba8 Adding a stdenv version of links2, to be able to cross-build it. This can be removed once 
builderDefs can be made to support the stdenvCross adapter


svn path=/nixpkgs/branches/stdenv-updates/; revision=24927
 2010-11-29 18:03:03 +00:00
Michael Raskin b01f33c2b8 Update gajim 
svn path=/nixpkgs/trunk/; revision=24906
 2010-11-28 13:46:32 +00:00
Evgeny Egorochkin a729c92721 Chromium: fix deps and clean up. Patch by Cillian de Róiste. 
svn path=/nixpkgs/trunk/; revision=24898
 2010-11-28 09:27:45 +00:00
Evgeny Egorochkin 5e994b9153 ekiga: fix build failure. Patch by Karn Kallio. 
svn path=/nixpkgs/trunk/; revision=24897
 2010-11-28 09:21:36 +00:00
Lluís Batlle i Rossell 614c40a1e1 Adding the 'gzip' dependency to lynx (important cross-building). 
Otherwise, on a cross-built lynx, it cannot gunzip pages that came in gzip-compressed.
(It was calling the host gzip, a lynx dependency, before)


svn path=/nixpkgs/branches/stdenv-updates/; revision=24882
 2010-11-26 18:43:55 +00:00
Lluís Batlle i Rossell 0e4c970d11 Updating from trunk - I hope I fixed the conflict around gettext - I left it as 
it was before merging.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24876
 2010-11-26 14:40:39 +00:00
Sander van der Burg 2549fea1bb Upgraded pidgin to version 2.7.7 
svn path=/nixpkgs/trunk/; revision=24844
 2010-11-24 21:58:52 +00:00
Michael Raskin 6af8a1debd Merging from trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24804
 2010-11-22 11:39:42 +00:00
Michael Raskin 7195b61a31 Update Wireshark 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24785
 2010-11-20 20:51:29 +00:00
Evgeny Egorochkin 65b669feb8 VirtualBox: fix i686 compilation 
svn path=/nixpkgs/trunk/; revision=24783
 2010-11-20 10:41:53 +00:00
Michael Raskin fb58f74d82 Updating from trunk again 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
 2010-11-17 17:03:09 +00:00
Michael Raskin 2d574a718a Mike Firefox 4.0 beta 7 build 
svn path=/nixpkgs/trunk/; revision=24719
 2010-11-17 09:34:21 +00:00
Michael Raskin bbcc101bce Work around -lpthread dependencies 
svn path=/nixpkgs/trunk/; revision=24718
 2010-11-17 08:59:10 +00:00
Michael Raskin e59ddf7bcb Update Cairo, Pixman; update FF4beta - still broken, cannot pass fresh cairo correctly to it yet 
svn path=/nixpkgs/trunk/; revision=24714
 2010-11-16 21:05:54 +00:00
Eelco Dolstra 1761d5a53a * Latest Firefox, Thunderbird. 
svn path=/nixpkgs/trunk/; revision=24708
 2010-11-16 12:37:28 +00:00
Lluís Batlle i Rossell 5d090f37a0 Updating the putty hash of the svn rev. Somehow it gives now a different hash of what there was. 
I don't understand why. Maybe I had committed a broken hash from the very beginning.

svn path=/nixpkgs/trunk/; revision=24694
 2010-11-15 19:44:40 +00:00
Russell O'Connor 4018b1dd39 updating flashplayer 
svn path=/nixpkgs/trunk/; revision=24678
 2010-11-12 18:58:24 +00:00
Lluís Batlle i Rossell 8746de3ae8 Updating from trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24674
 2010-11-11 22:18:14 +00:00
Rob Vermaas a4ab931719 applied patch by Cillian de Róiste 
svn path=/nixpkgs/trunk/; revision=24598
 2010-11-04 12:09:40 +00:00
Armijn Hemel b247c239e5 update to 2.7.5 
svn path=/nixpkgs/trunk/; revision=24584
 2010-11-03 14:03:53 +00:00
Lluís Batlle i Rossell f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in 
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
 2010-10-31 19:30:31 +00:00
Eelco Dolstra 8aa38f953c * Get Teamspeak 3 to work. This is the x86_64-linux build, I'll add 
i686-linux later.

svn path=/nixpkgs/trunk/; revision=24516
 2010-10-28 17:45:18 +00:00
Michael Raskin 65ec046a15 Fix uzbl build 
svn path=/nixpkgs/trunk/; revision=24440
 2010-10-23 20:54:07 +00:00
Lluís Batlle i Rossell 6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
 2010-10-23 14:52:21 +00:00