3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

920 commits

Author SHA1 Message Date
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
Evgeny Egorochkin 6951e2ad05 Konq-plugins: forgot the patch :(
svn path=/nixpkgs/trunk/; revision=24426
2010-10-22 19:47:23 +00:00
Armijn Hemel 9992ba5e3f update to 2.7.4
svn path=/nixpkgs/trunk/; revision=24424
2010-10-22 16:06:32 +00:00
Evgeny Egorochkin fbbcd05f4d konq-plugins: fix compilation against qt 4.7
svn path=/nixpkgs/trunk/; revision=24419
2010-10-22 14:40:19 +00:00
Eelco Dolstra 92d36afe96 * Firefox 3.6.11.
svn path=/nixpkgs/trunk/; revision=24399
2010-10-21 11:29:35 +00:00
Evgeny Egorochkin fedae8382f Arora: version bump
svn path=/nixpkgs/trunk/; revision=24314
2010-10-15 23:43:21 +00:00
Michael Raskin a81b5af5ee Add more buildInputs useful for FF4.0. This is not enough yet
svn path=/nixpkgs/trunk/; revision=24266
2010-10-13 13:12:43 +00:00
Michael Raskin c8161ad799 Temporary fix for Vacuum-1.0.2 with Qt-4.7
svn path=/nixpkgs/trunk/; revision=24257
2010-10-12 23:15:25 +00:00
Lluís Batlle i Rossell 74ae423a6a Reverting a patch I did removing this special lynx configuration I add again.
Otherwise, lynx really does not build with widechar support.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24251
2010-10-12 20:57:02 +00:00
Lluís Batlle i Rossell 57df19fe85 utf-8 was not working in cross-built ncurses programs due to some old problem
cross-building ncursesw not present anymore. I reenable unicode cross-building.


svn path=/nixpkgs/branches/stdenv-updates/; revision=24245
2010-10-12 19:06:04 +00:00
Lluís Batlle i Rossell 3c29a00612 Making lynx cross-build with widechar support
svn path=/nixpkgs/branches/stdenv-updates/; revision=24242
2010-10-12 18:31:11 +00:00
Rob Vermaas ee7826f71f update chromium
svn path=/nixpkgs/trunk/; revision=24237
2010-10-12 08:09:57 +00:00
Yury G. Kudryashov 1c95704fa1 rekonq-0.6.1
svn path=/nixpkgs/trunk/; revision=24230
2010-10-12 05:41:13 +00:00
Lluís Batlle i Rossell e7e103b8eb Updating from trunk (to catch cron changes)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24200
2010-10-10 11:44:28 +00:00
Michael Raskin a066ee7f06 Firefox 4 requires Mesa
svn path=/nixpkgs/trunk/; revision=24188
2010-10-08 19:07:10 +00:00
Lluís Batlle i Rossell 75d326e697 Committing the chromium patch by Cillian de Róiste
svn path=/nixpkgs/trunk/; revision=24177
2010-10-08 09:25:54 +00:00
Lluís Batlle i Rossell 6d4288687c Committing the flash patch by Cillian de Róiste
svn path=/nixpkgs/trunk/; revision=24176
2010-10-08 09:25:39 +00:00
Lluís Batlle i Rossell 11404a404f Committing the patch from Carles Pagès, which had already sent Ilya Cassina before
svn path=/nixpkgs/trunk/; revision=24175
2010-10-08 09:22:34 +00:00
Michael Raskin 981e71fa3e Add FF4.0 beta 6
svn path=/nixpkgs/trunk/; revision=24172
2010-10-08 08:28:00 +00:00
Lluís Batlle i Rossell fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Michael Raskin 4325bd0b28 Update Wireshark to release
svn path=/nixpkgs/trunk/; revision=24129
2010-10-07 07:56:00 +00:00
Ludovic Courtès b67487377d BitlBee 1.2.8.
svn path=/nixpkgs/trunk/; revision=24128
2010-10-07 07:29:44 +00:00
Yury G. Kudryashov fb8d50d76a Make quassel compile with kde-4.5
kde45.kde is an attribute set, so rename flag to withKDE.

svn path=/nixpkgs/trunk/; revision=24096
2010-10-05 18:08:45 +00:00
Yury G. Kudryashov 673e66e3a3 Move most kde-extragear apps to top-level
svn path=/nixpkgs/trunk/; revision=24092
2010-10-05 17:44:33 +00:00
Yury G. Kudryashov 1099a83b54 Make kadu build in chroot. TODO: re-enable icons
svn path=/nixpkgs/trunk/; revision=24064
2010-10-05 05:43:59 +00:00
Lluís Batlle i Rossell cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Lluís Batlle i Rossell 5032b693b2 Fix for mips64 for mldonkey (I'll submit it upstream)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24035
2010-10-03 09:18:44 +00:00
Lluís Batlle i Rossell 0c7429f8cc My attempts to build mldonkey on the fuloong
svn path=/nixpkgs/branches/stdenv-updates/; revision=24034
2010-10-03 09:18:31 +00:00
Lluís Batlle i Rossell 7eb92a7821 Adding kadu
(patch by Piotr Pietraszkiewicz)

svn path=/nixpkgs/trunk/; revision=23988
2010-09-28 22:37:44 +00:00
Evgeny Egorochkin 0488c4516a Flash player: works in Konqueror now, fixed missing library link.
Fixed hash: Stupid Adobe changed the file again :(

svn path=/nixpkgs/trunk/; revision=23931
2010-09-26 03:22:55 +00:00
Yury G. Kudryashov f726884df5 Old flashplayer is not available anymore
svn path=/nixpkgs/trunk/; revision=23896
2010-09-22 18:04:29 +00:00
Michael Raskin 3410afb706 Fix arora platform
svn path=/nixpkgs/trunk/; revision=23892
2010-09-22 08:59:50 +00:00
Evgeny Egorochkin 5581a546ec Arora: fix homepage
svn path=/nixpkgs/trunk/; revision=23884
2010-09-21 15:47:20 +00:00
Evgeny Egorochkin 020cba6b98 Arora: packaged
svn path=/nixpkgs/trunk/; revision=23877
2010-09-20 22:16:16 +00:00
Michael Raskin b383ca8d2a Add Vacuum IM
svn path=/nixpkgs/trunk/; revision=23870
2010-09-20 08:40:30 +00:00
Lluís Batlle i Rossell 2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
David Guibert c6f9d17b9a update msmtp up to version 1.4.21
svn path=/nixpkgs/trunk/; revision=23837
2010-09-17 17:34:03 +00:00
Eelco Dolstra fac8ff8d71 * Firefox 3.6.10.
svn path=/nixpkgs/trunk/; revision=23820
2010-09-16 11:44:48 +00:00
Ludovic Courtès 11a446272a GNU IceCat 3.6.9.
svn path=/nixpkgs/trunk/; revision=23802
2010-09-14 16:39:42 +00:00
Yury G. Kudryashov 38dec40ddc Upgrade ktorrent
svn path=/nixpkgs/trunk/; revision=23754
2010-09-13 14:23:02 +00:00
Eelco Dolstra b63de97e4c * Updated gecko-mediaplayer and gnome-mplayer.
svn path=/nixpkgs/trunk/; revision=23737
2010-09-11 17:16:42 +00:00
Eelco Dolstra bf7c353ad1 * Updated Chromium.
svn path=/nixpkgs/trunk/; revision=23736
2010-09-11 14:20:46 +00:00
Eelco Dolstra 6d1f247646 * Firefox 3.6.9.
svn path=/nixpkgs/trunk/; revision=23711
2010-09-10 10:56:44 +00:00
Lluís Batlle i Rossell f01245ee4a Improving a bit the configure options for mutt:
Enable debug
Fix a copy and paste error in --without-sasl

svn path=/nixpkgs/trunk/; revision=23654
2010-09-06 07:17:20 +00:00
Michael Raskin 29db2ca0c9 Adding Ekiga
svn path=/nixpkgs/trunk/; revision=23653
2010-09-05 23:37:54 +00:00
Michael Raskin 9090138f5e Updating Gajim
svn path=/nixpkgs/trunk/; revision=23642
2010-09-05 12:29:44 +00:00
Lluís Batlle i Rossell 0a50f8cc6a Fixing the w3m build on non-mips (this may allow having the 'tarball' built)
svn path=/nixpkgs/branches/stdenv-updates/; revision=23604
2010-09-02 20:09:27 +00:00
Lluís Batlle i Rossell d984e4bffd New patch for firefox, to avoid a SIGBUS on mips.
r0bertz gave me the patch through irc:
http://www.gentoo-cn.org/gitweb/?p=loongson.git;a=blob;f=net-libs/xulrunner/files/xulrunner-1.9.2_beta4-mips-bus-error.patch;h=2bf51d77054796ffaf4f4d903dd8560bf96b7844;hb=HEAD
"some insns requires addr to be 8 bytes alignment, xulrunner can't guarantee that"
"instead it guarantees some addr will be sizeof(void *) aligned."

svn path=/nixpkgs/branches/stdenv-updates/; revision=23585
2010-09-01 08:37:42 +00:00
Lluís Batlle i Rossell e2b1de78c2 Making firefox build on mips
svn path=/nixpkgs/branches/stdenv-updates/; revision=23584
2010-09-01 08:37:28 +00:00
Lluís Batlle i Rossell 82627f99bb New patch for firefox for mips
svn path=/nixpkgs/branches/stdenv-updates/; revision=23583
2010-09-01 08:37:17 +00:00
Lluís Batlle i Rossell c700d8c5ee Patch that allows xulrunner (for firefox 3.6) build further.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23582
2010-09-01 08:37:07 +00:00
Michael Raskin 3a0bf4d42d Update wireshark
svn path=/nixpkgs/trunk/; revision=23516
2010-08-29 19:17:00 +00:00
Lluís Batlle i Rossell cca1cae042 Updating from trunk. I had to do some changes to make it fit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23500
2010-08-29 11:09:23 +00:00
Eelco Dolstra 867707c07d * Thunderbird 3.1.2.
svn path=/nixpkgs/trunk/; revision=23484
2010-08-27 14:32:58 +00:00
Michael Raskin 90603fd593 Update Midori
svn path=/nixpkgs/trunk/; revision=23397
2010-08-24 13:58:57 +00:00
Lluís Batlle i Rossell b8298c9cdd Adding a patch file I forgot for w3m, while the nix expression already refers to it.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23340
2010-08-21 20:13:02 +00:00
Yury G. Kudryashov 682e4ae09e Move konversation to pkgs
svn path=/nixpkgs/trunk/; revision=23330
2010-08-21 19:29:47 +00:00
Lluís Batlle i Rossell 7d3e0c542c Making w3m build with a newer boehm-gc
svn path=/nixpkgs/branches/stdenv-updates/; revision=23318
2010-08-21 17:07:03 +00:00
Lluís Batlle i Rossell f16353b6f2 Updated from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23275
2010-08-20 13:41:12 +00:00
Armijn Hemel f194a8aa93 update to 2.7.3
svn path=/nixpkgs/trunk/; revision=23215
2010-08-17 20:28:40 +00:00
Eelco Dolstra 4cbec5ca20 * Latest Flash player.
svn path=/nixpkgs/trunk/; revision=23204
2010-08-17 13:13:34 +00:00
David Guibert 829f6c2108 update chrome to available snapshots.
svn path=/nixpkgs/trunk/; revision=23135
2010-08-12 06:01:21 +00:00
Lluís Batlle i Rossell 51f6aec764 Fixing the gcc-cross-wrapper; it failed after some changes related to breaking
dependencies with it. (I should never link ld.so with a NIX_LDFLAGS -rpath
forced)

I made vim, scummvm cross-build. I added prboom (that cross-builds).
Mplayer and elinks don't cross-build fine still, but are on the way.
The mplayer fails to build in a weird way; nix does not show either a gcc
error message or even the 'make' error message.

svn path=/nixpkgs/branches/stdenv-updates/; revision=23131
2010-08-11 20:14:25 +00:00
Lluís Batlle i Rossell 039b660b5b Making lynx, yacas and alsa-lib crossbuild
svn path=/nixpkgs/branches/stdenv-updates/; revision=23130
2010-08-11 20:11:12 +00:00
Eelco Dolstra 21587bf10b * Use callPackage_i686 for i686-only packages.
svn path=/nixpkgs/trunk/; revision=23113
2010-08-11 13:25:30 +00:00
Lluís Batlle i Rossell ff5d0fa448 Merging from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23072
2010-08-09 21:21:30 +00:00
David Guibert 3b6101cd7f msn-pecan: an alternative MSN plugin for pidgin
svn path=/nixpkgs/trunk/; revision=23050
2010-08-09 06:51:34 +00:00
Lluís Batlle i Rossell 46082f25f9 Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
2010-08-07 20:14:04 +00:00
Eelco Dolstra a1e834e85a * Get rid of the ugly `useFromStdenv' hack in all-packages.nix.
Instead, use the generic package override mechanism to use packages
  from earlier bootstrap phases.
* Don't rely on the existence of attributes such as
  `stdenv.coreutils'.

svn path=/nixpkgs/trunk/; revision=22991
2010-08-06 10:34:34 +00:00
Eelco Dolstra 5f8b8ae1d1 * Added weechat and updated xfce-terminal and vte. (From Graeme
Caldwell <graemercaldwell@gmail.com>.)

svn path=/nixpkgs/trunk/; revision=22965
2010-08-05 15:47:15 +00:00
Yury G. Kudryashov a993d5190a Add quassel only on qt4.meta.platforms platforms
qt4 somehow depends on libcap which is linux only

svn path=/nixpkgs/trunk/; revision=22932
2010-08-03 14:17:55 +00:00
Lluís Batlle i Rossell 5417c720fd Merging from trunk.
I tried to fix some trivial conflicts.
I don't know if I merged well some more difficult conflicts on openssl/darwin_patch
or haskell-platform.


svn path=/nixpkgs/branches/stdenv-updates/; revision=22878
2010-08-02 15:48:19 +00:00
Yury G. Kudryashov 45fd5a9836 Upgrade rekonq
svn path=/nixpkgs/trunk/; revision=22835
2010-07-31 13:06:10 +00:00
Eelco Dolstra 4bf5b0d36b * Fix some more "args: with args".
svn path=/nixpkgs/trunk/; revision=22828
2010-07-30 14:47:23 +00:00
Eelco Dolstra 907bb1aac6 * ltrace: updated to 0.5.3.
* libdbi / libdbi-drivers: updated to 0.8.3, and make it compile with
  SQLite.
* qemu-image: fix the URL.
* gdmap: make it build again (requires an older GTK+).
* rlwrap: updated to 0.37.
* smbfs-fuse -> fusesmb to match the upstream name.
* x11vnc: updated to 0.9.10.
* clearlyU: fix the URL.
* Various packages: follow the coding conventions.

svn path=/nixpkgs/trunk/; revision=22814
2010-07-29 18:55:16 +00:00
Eelco Dolstra ba498d4a43 * composedArgsAndFun -> makeOverridable for consistency.
* Rename a few single-version packages to "default.nix".

svn path=/nixpkgs/trunk/; revision=22803
2010-07-29 08:21:21 +00:00
Eelco Dolstra f1598a8941 * More cleanup.
svn path=/nixpkgs/trunk/; revision=22798
2010-07-28 18:01:17 +00:00
Eelco Dolstra 6609710409 * Get rid of many instances of "args: with args;", and other coding
guidelines violations.
* Updated libsamplerate to 0.1.7.

svn path=/nixpkgs/trunk/; revision=22782
2010-07-28 11:55:54 +00:00
Eelco Dolstra 42016ca6aa * Firefox 3.6.8.
svn path=/nixpkgs/trunk/; revision=22747
2010-07-27 11:35:31 +00:00
Eelco Dolstra 228c6e0c1f * Merged the x-updates branch (latest X server / libraries, GTK+,
Fontconfig, etc.).

svn path=/nixpkgs/trunk/; revision=22735
2010-07-26 13:59:12 +00:00
Ludovic Courtès c0cafc5ec7 GNU IceCat 3.6.7.
svn path=/nixpkgs/trunk/; revision=22732
2010-07-25 14:16:09 +00:00
Armijn Hemel 066bd72e6f update to 2.7.2
svn path=/nixpkgs/trunk/; revision=22729
2010-07-25 11:10:10 +00:00
Eelco Dolstra 9b87ffa522 * Make mutt build against OpenSSL 1.0.0.
svn path=/nixpkgs/branches/x-updates/; revision=22724
2010-07-24 08:50:30 +00:00
Eelco Dolstra 0db478d40b * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=22707
2010-07-22 13:18:07 +00:00
Eelco Dolstra ea14f111dd * Chatzilla updated to 0.9.86.
svn path=/nixpkgs/branches/x-updates/; revision=22706
2010-07-22 12:59:12 +00:00
David Guibert 3d6c9cfd7f firefox: should be sha1
svn path=/nixpkgs/trunk/; revision=22686
2010-07-21 11:55:33 +00:00
Eelco Dolstra 7f3838c16a * Firefox 3.6.7, Thunderbird 3.1.1.
svn path=/nixpkgs/trunk/; revision=22682
2010-07-21 08:15:52 +00:00
Eelco Dolstra f2aa054357 * Revive gmime-2.2.x, because gmime-2.4.x is not backwards
compatible.  For instance, Pan requires gmime-2.2.

svn path=/nixpkgs/trunk/; revision=22543
2010-07-09 09:12:42 +00:00
Rob Vermaas ac26c3bee1 new version of chrome with new deps
svn path=/nixpkgs/trunk/; revision=22486
2010-07-06 08:18:14 +00:00
David Guibert 362d1ba38f update firefox to 3.6.6
svn path=/nixpkgs/trunk/; revision=22424
2010-06-27 19:55:21 +00:00
David Guibert 9d4a13f798 thunderbird: 3.1
svn path=/nixpkgs/trunk/; revision=22421
2010-06-26 14:23:22 +00:00
Evgeny Egorochkin 37345d1fb8 Make Hydra compile Quassel
svn path=/nixpkgs/trunk/; revision=22418
2010-06-26 01:40:50 +00:00
Eelco Dolstra 01e1b1ff2e * Upgrade Flash (32-bit) to 10.1.53.64 so that I can watch youtube
again :-)

svn path=/nixpkgs/trunk/; revision=22416
2010-06-25 20:40:59 +00:00
Lluís Batlle i Rossell d7ceeb0574 Attempt to fix the firefox 3.6 symlinks problem (that makes it segfault at start, if
the user does not remove the compatibility.ini from its profile)

svn path=/nixpkgs/trunk/; revision=22408
2010-06-24 21:23:37 +00:00
Eelco Dolstra 5dc0d3dbcf * Firefox 3.5.10.
svn path=/nixpkgs/trunk/; revision=22386
2010-06-22 20:26:49 +00:00
Eelco Dolstra 29547d6a01 * Firefox 3.6.4. Still segfaults though.
svn path=/nixpkgs/trunk/; revision=22383
2010-06-22 17:20:33 +00:00
Eelco Dolstra e77abe22e6 * Thunderbird 3.0.5.
svn path=/nixpkgs/trunk/; revision=22382
2010-06-22 16:51:44 +00:00
Evgeny Egorochkin d9b78f206f Added Quassel IRC client.
By default it's compiled as monolithic, but as soon as there's
a corresponding service, it should be changed to client/daemon split.

svn path=/nixpkgs/trunk/; revision=22351
2010-06-20 23:48:59 +00:00
Michael Raskin 4462d3b9c7 Fix some strange Uzbl library problem
svn path=/nixpkgs/trunk/; revision=22310
2010-06-17 15:23:38 +00:00
Michael Raskin 6790312f30 Update uzbl
svn path=/nixpkgs/trunk/; revision=22301
2010-06-17 04:22:08 +00:00
Lluís Batlle i Rossell 14e7dc47a5 Updating mldonkey
svn path=/nixpkgs/trunk/; revision=22290
2010-06-16 07:58:22 +00:00
Michael Raskin 62e6ad4960 Add OpenSSL and VoIP support to Gajim
svn path=/nixpkgs/trunk/; revision=22194
2010-06-09 12:56:15 +00:00
Marc Weber cfec548174 [PATCH] Fix pidgin-sipe plugin to build with latest pidgin - contributed
by David Brown

svn path=/nixpkgs/trunk/; revision=22129
2010-06-03 15:14:29 +00:00
Marc Weber 8dcb020e80 updating opera 10.10
svn path=/nixpkgs/trunk/; revision=22112
2010-06-02 23:35:39 +00:00
Marc Weber 473d5a9ba8 pidgin update, ICQ messages were suddenly embedded within HTML text ?
svn path=/nixpkgs/trunk/; revision=22091
2010-06-01 17:45:05 +00:00
Michael Raskin d0b4c2e0c2 Gajim uses $0 to determine the invoked program. So change the wrapping strategy
svn path=/nixpkgs/trunk/; revision=22069
2010-05-31 21:10:06 +00:00
Michael Raskin 3e450dc102 Oops, Gajim tarball moved
svn path=/nixpkgs/trunk/; revision=22035
2010-05-28 09:20:56 +00:00
Michael Raskin 0687f2064f Updating Gajim to 0.13.4
svn path=/nixpkgs/trunk/; revision=22027
2010-05-28 06:04:31 +00:00
David Guibert acafca89ba add tls support for msmtp
svn path=/nixpkgs/trunk/; revision=22010
2010-05-27 19:33:33 +00:00
Yury G. Kudryashov d737607b56 rekonq-0.4.90
svn path=/nixpkgs/trunk/; revision=21979
2010-05-26 05:57:55 +00:00
Eelco Dolstra 0619aaf2ac * Transmission updated to 1.93.
svn path=/nixpkgs/trunk/; revision=21923
2010-05-20 13:39:16 +00:00
Eelco Dolstra cfd6e0f21b * The desktop item should be named "Firefox", not "firefox".
svn path=/nixpkgs/trunk/; revision=21840
2010-05-18 14:58:45 +00:00
Rob Vermaas a07cdd3b23 * added patchelf pre-release 0.6 until it gets stable
* updated chrome to latest version


svn path=/nixpkgs/trunk/; revision=21836
2010-05-18 12:36:23 +00:00
Peter Simons c29e6c97f1 Only set font in wrapper if we have X.
Unison's wrapper was generating errors by calling xset even if DISPLAY
was not set.  This was especially noticeable when connecting to a
remote server to sync with.

Fix this by only setting the font path if DISPLAY is set to something.

svn path=/nixpkgs/trunk/; revision=21821
2010-05-17 16:16:48 +00:00
Rob Vermaas 93f0bf658e irssi: enable perl support
svn path=/nixpkgs/trunk/; revision=21819
2010-05-17 15:52:56 +00:00
Peter Simons 71f164ac1e Three Games and Perl Support for Irssi
Here are four patches. Three of them add expressions for games. The
fourth, irssi-perl.patch, adds perl as an input for irssi, so that one
can run perl plugins in irssi. I didn't make the perl input optional,
but maybe it should be to keep the irssi expression light.

svn path=/nixpkgs/trunk/; revision=21813
2010-05-17 09:21:42 +00:00
Armijn Hemel c239f0d20e update to 2.7.0
svn path=/nixpkgs/trunk/; revision=21798
2010-05-16 16:31:04 +00:00
Yury G. Kudryashov e69bf4f278 Remove unused lines
svn path=/nixpkgs/trunk/; revision=21780
2010-05-15 09:49:07 +00:00
Yury G. Kudryashov 52c65a1e62 Add rekonq browser (both 0.4.0 and latest git)
svn path=/nixpkgs/trunk/; revision=21779
2010-05-15 09:47:32 +00:00
Marc Weber 57cffe5040 pidgin plugin sipe contributed by David Brown
svn path=/nixpkgs/trunk/; revision=21730
2010-05-11 17:28:54 +00:00
Lluís Batlle i Rossell f1fc3e3ef1 Fixing the putty name, from putty-rNUM to putty-NUM, so nix-env -i putty installs it.
svn path=/nixpkgs/trunk/; revision=21729
2010-05-11 16:17:39 +00:00
Lluís Batlle i Rossell 6dd72c5897 Updating putty to the last svn version, so now it can work with gtk2. The previous
wanted gtk1, that did not build on x86_64-linux

svn path=/nixpkgs/trunk/; revision=21649
2010-05-07 14:18:00 +00:00
Lluís Batlle i Rossell b14e71be03 Updating irssi
svn path=/nixpkgs/trunk/; revision=21476
2010-05-01 10:33:00 +00:00
Marc Weber 8a79919093 fix flash player debug build
svn path=/nixpkgs/trunk/; revision=21411
2010-04-28 20:02:40 +00:00
Alexander Tsamutali 755d7d8883 conkeror: Switched to zip snapshots, because tarballs are different on every fetchurl.
svn path=/nixpkgs/trunk/; revision=21298
2010-04-24 19:09:33 +00:00
Alexander Tsamutali f45cfbe272 conkeror: New nixpkg.
svn path=/nixpkgs/trunk/; revision=21296
2010-04-24 17:34:58 +00:00
Eelco Dolstra 28695d990c * Thunderbird 3.0.4.
svn path=/nixpkgs/trunk/; revision=21206
2010-04-21 14:02:28 +00:00
Armijn Hemel 1aee2df93a update libpcap to 1.1.1 and wireshark to 1.3.4
svn path=/nixpkgs/trunk/; revision=21205
2010-04-21 13:31:08 +00:00
Lluís Batlle i Rossell a79eba93e2 Updating elinks to a prerelease that has full utf-8 support
svn path=/nixpkgs/trunk/; revision=21039
2010-04-12 22:56:13 +00:00
Lluís Batlle i Rossell ec8f2bdc1b Adding sasl support to mutt, so ssmtp sending works
svn path=/nixpkgs/trunk/; revision=21038
2010-04-12 22:21:01 +00:00
Lluís Batlle i Rossell 165bc84831 Adding smtp support to mutt
svn path=/nixpkgs/trunk/; revision=21037
2010-04-12 22:10:15 +00:00
Yury G. Kudryashov f25c68f01a Remove old kde packages
svn path=/nixpkgs/trunk/; revision=21011
2010-04-11 15:50:41 +00:00
Yury G. Kudryashov eb20e3b926 Add gpm support to elinks
svn path=/nixpkgs/trunk/; revision=21003
2010-04-10 20:27:02 +00:00
Eelco Dolstra 2f423bbf1f * Firefox 3.5.9.
svn path=/nixpkgs/trunk/; revision=20992
2010-04-09 13:06:46 +00:00
Lluís Batlle i Rossell 882e258fbc Updating firefox. For xulrunner, I moved the version number up too; I don't know what did I have to do with it.
svn path=/nixpkgs/trunk/; revision=20948
2010-04-05 16:04:50 +00:00
Lluís Batlle i Rossell bb8a2181ad Updating kismet
svn path=/nixpkgs/trunk/; revision=20934
2010-04-03 22:07:59 +00:00
Alexander Tsamutali 99f19e27de applications/networking/p2p/transmission: New nixpkg.
svn path=/nixpkgs/trunk/; revision=20840
2010-03-28 00:06:30 +00:00
Eelco Dolstra 318234c091 * flashplayer: fix the version number.
svn path=/nixpkgs/trunk/; revision=20792
2010-03-23 19:35:48 +00:00
Eelco Dolstra 4bd60ef8fc * Updated Firefox to 3.6.2. Hopefully it works now.
svn path=/nixpkgs/trunk/; revision=20777
2010-03-23 10:27:47 +00:00
Michael Raskin f05adf46bd Make FlashPlayer9 build for now..
svn path=/nixpkgs/trunk/; revision=20641
2010-03-16 06:44:02 +00:00
Michael Raskin a45255dee9 Fix Chromium
svn path=/nixpkgs/trunk/; revision=20251
2010-02-25 13:22:51 +00:00
Ludovic Courtès f07aa3d96d GNUnet 0.8.1b.
svn path=/nixpkgs/trunk/; revision=20245
2010-02-25 10:31:36 +00:00
Armijn Hemel 68164d951e update to 2.6.6
svn path=/nixpkgs/trunk/; revision=20199
2010-02-23 17:17:53 +00:00
Lluís Batlle i Rossell 454fb58a39 Updating psi, so it builds with gcc 4.4
svn path=/nixpkgs/trunk/; revision=20165
2010-02-22 09:53:17 +00:00
Eelco Dolstra af717b48f4 * Firefox 3.5.8.
svn path=/nixpkgs/trunk/; revision=20125
2010-02-19 10:03:31 +00:00
Lluís Batlle i Rossell 9dc143e9aa Updating the flash player 10 for linux.
svn path=/nixpkgs/trunk/; revision=20003
2010-02-15 08:49:02 +00:00
Ludovic Courtès 5fe8c274d5 GNU IceCat: Fix the file name of `firefox.js'.
svn path=/nixpkgs/trunk/; revision=19990
2010-02-14 14:16:15 +00:00
Ludovic Courtès ac4cd45459 GNU IceCat: Fix typo.
svn path=/nixpkgs/trunk/; revision=19989
2010-02-14 11:37:45 +00:00
Ludovic Courtès 928f2c52e1 GNU IceCat: Fix the fix.
svn path=/nixpkgs/trunk/; revision=19987
2010-02-13 22:46:25 +00:00
Ludovic Courtès 0276958fed GNU IceCat: Attempt to work around known bugs.
svn path=/nixpkgs/trunk/; revision=19986
2010-02-13 22:36:48 +00:00
Lluís Batlle i Rossell 683688f476 Updating skype. Finally!
I think that patchelf was breaking the binary, and I decided to use a wrapper
with a LD_LIBRARY_PATH.

svn path=/nixpkgs/trunk/; revision=19968
2010-02-12 23:19:37 +00:00
Eelco Dolstra a617a7c239 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
2010-02-03 14:23:43 +00:00
Eelco Dolstra b6943f0056 * Clean up the Lynx expression a bit.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19775
2010-02-03 12:24:03 +00:00
Ludovic Courtès d5219beafc GNU IceCat 3.6: Disable WiFi stuff for now.
svn path=/nixpkgs/trunk/; revision=19744
2010-02-01 09:16:56 +00:00
Ludovic Courtès 7f213f0403 GNU IceCat: Add missing dependency.
svn path=/nixpkgs/trunk/; revision=19720
2010-01-28 21:13:04 +00:00
Ludovic Courtès 87e7334e64 GNU IceCat: Stick to good ol' bzip2 for now.
svn path=/nixpkgs/trunk/; revision=19712
2010-01-27 15:25:31 +00:00
Ludovic Courtès 828985f2d7 GNU IceCat 3.6.
svn path=/nixpkgs/trunk/; revision=19702
2010-01-27 08:53:31 +00:00
Eelco Dolstra e907369c62 * Applied a patch to make Pan build with GCC 4.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19667
2010-01-26 14:48:44 +00:00
Lluís Batlle i Rossell bcba809460 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19654
2010-01-25 18:52:07 +00:00
Eelco Dolstra c7194fe7cf * Added Firefox 3.6. It's not entirely stable yet though. In
particular it segfaults with the `-P' option.

svn path=/nixpkgs/trunk/; revision=19606
2010-01-21 22:23:59 +00:00
Eelco Dolstra b8f106abd7 * Throw away some old versions of Firefox.
svn path=/nixpkgs/trunk/; revision=19604
2010-01-21 21:14:22 +00:00
Lluís Batlle i Rossell df68759142 Updating from trunk, to get the new mldonkey.
Cleaning the mldonkey expression to build with the ocaml native compiler in some
platforms, and with the bytecode in others.
Removing the flag to support ocaml-3.11.1, as it is included in this new
version of mldonkey.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19487
2010-01-16 16:41:33 +00:00
Lluís Batlle i Rossell 68c9d127ed Updating mldonkey, and adding more build-type add-ons.
svn path=/nixpkgs/trunk/; revision=19486
2010-01-16 16:31:52 +00:00
Lluís Batlle i Rossell 70dd97620c Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=19485
2010-01-16 15:19:23 +00:00
Lluís Batlle i Rossell 89944b6cf0 Updating unison.
svn path=/nixpkgs/trunk/; revision=19468
2010-01-15 15:09:46 +00:00
Lluís Batlle i Rossell 9183f21f7e Merging from trunk.
I fixed conflicts regarding the renaming 'kernel' -> 'linux' in all-packages.
Also a small conflict in all-packages about making openssl overridable.
And I some linux 2.6.31-zen kernel files also marked in conflict.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19438
2010-01-14 14:49:31 +00:00
Ludovic Courtès 5080aa43d3 GNUnet: Add `meta.platforms'.
svn path=/nixpkgs/trunk/; revision=19414
2010-01-13 21:34:45 +00:00
Eelco Dolstra de360dbe76 * Firefox 3.0.17.
svn path=/nixpkgs/trunk/; revision=19392
2010-01-13 13:21:06 +00:00
Armijn Hemel 577f4d8325 update to 2.6.5, also add python dependency for extensions and all that
svn path=/nixpkgs/trunk/; revision=19352
2010-01-11 13:25:05 +00:00
Eelco Dolstra cdc307536c * Firefox 3.5.7.
svn path=/nixpkgs/trunk/; revision=19349
2010-01-11 10:43:29 +00:00
Ludovic Courtès 8048817e1e GNU IceCat 3.5.7.
svn path=/nixpkgs/trunk/; revision=19348
2010-01-11 10:16:50 +00:00
Armijn Hemel ae80a8ed48 update to 3.0.7, requires perl now
svn path=/nixpkgs/trunk/; revision=19231
2010-01-05 12:29:58 +00:00
Ludovic Courtès bfb476c7d6 GNUnet 0.8.1.
svn path=/nixpkgs/trunk/; revision=19219
2010-01-05 11:16:42 +00:00
Rob Vermaas c5157f7d9d re-added libjpeg62 for chrome, updated chrome
svn path=/nixpkgs/trunk/; revision=19199
2010-01-04 07:47:32 +00:00
Marc Weber bbf8253985 adding debug version of i686 flash player. See comments
svn path=/nixpkgs/trunk/; revision=19195
2010-01-04 07:44:24 +00:00
Eelco Dolstra 05fce85edc * Thunderbird 3.0. It doesn't use the Xulrunner package, as building
against an external Xulrunner seems to be unsupported currently.

svn path=/nixpkgs/trunk/; revision=19169
2010-01-02 13:21:50 +00:00
Eelco Dolstra 0dc9f7dd4f * Put the Thunderbird 2 and 3 expressions in one directory.
svn path=/nixpkgs/trunk/; revision=19167
2010-01-01 16:35:43 +00:00
Armijn Hemel c8af5fd4dc update to 1.2.4
svn path=/nixpkgs/trunk/; revision=19162
2009-12-30 22:11:43 +00:00
Rob Vermaas 6f41d4d034 different hash flash player 10
svn path=/nixpkgs/trunk/; revision=19149
2009-12-30 07:17:42 +00:00
Lluís Batlle i Rossell d864771e26 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19139
2009-12-28 11:40:34 +00:00
Armijn Hemel d993cf0f5f add voice and video
svn path=/nixpkgs/trunk/; revision=19136
2009-12-27 16:49:08 +00:00
Armijn Hemel 500f81e68d update to 1.5.20, add perl as extra dependency
svn path=/nixpkgs/trunk/; revision=19127
2009-12-25 20:02:31 +00:00
Armijn Hemel c066f11f80 update to 3.0.6
svn path=/nixpkgs/trunk/; revision=19120
2009-12-25 18:33:44 +00:00
Armijn Hemel c79eb46c7e update to 2.7.1
svn path=/nixpkgs/trunk/; revision=19119
2009-12-25 18:27:48 +00:00
Armijn Hemel 2009c65a99 konversation project website has moved, konversation.org has been abandoned
svn path=/nixpkgs/trunk/; revision=19117
2009-12-25 17:17:24 +00:00
Armijn Hemel 29bd8e55f8 update to 0.8.14
svn path=/nixpkgs/trunk/; revision=19116
2009-12-25 17:15:44 +00:00
Armijn Hemel 0814a30d2c update to 2.8.7
svn path=/nixpkgs/trunk/; revision=19111
2009-12-25 14:34:11 +00:00
Armijn Hemel a53ab8a2e7 update to 1.3.2
svn path=/nixpkgs/trunk/; revision=19107
2009-12-25 12:38:08 +00:00
Armijn Hemel 2e6b173032 update to 2.6.4. voice and video are not working atm
svn path=/nixpkgs/trunk/; revision=19086
2009-12-23 21:05:29 +00:00
Eelco Dolstra 6eb6fec8a1 * Firefox 3.5.6.
svn path=/nixpkgs/trunk/; revision=19075
2009-12-22 09:07:19 +00:00
Ludovic Courtès 310d6e4bbf Update from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19066
2009-12-21 11:09:23 +00:00
Ludovic Courtès 99f646595c GNU IceCat 3.5.6.
svn path=/nixpkgs/trunk/; revision=19053
2009-12-20 19:49:40 +00:00
Lluís Batlle i Rossell dae3eb2383 Merging from trunk.
I resolved two conflicts:
- cmake (trunk fixes + stdenv-updates cross-compiling)
- all-packages (trunk gcc-wrapper2 + stdenv-updates gcc44)


svn path=/nixpkgs/branches/stdenv-updates/; revision=18912
2009-12-12 18:39:09 +00:00
Marc Weber f62924477e fix hash of libCSS (netsurf browser)
svn path=/nixpkgs/trunk/; revision=18908
2009-12-12 00:20:29 +00:00
Marc Weber 5319704f80 removing old bleeding edge cruft replacing it by a niftier version using
source regions which are substituded by the tool nix-repository-manager.
See http://github.com/MarcWeber/nix-repository-manager/raw/master/README.

sourceByName is called sourceFromHead now.

updates: MPlayerTrunk, haxe, neko, netsurf, cinelerra, ctags
cinelerra does no longer build due to Xorg update

svn path=/nixpkgs/trunk/; revision=18894
2009-12-11 13:58:23 +00:00
Lluís Batlle i Rossell 89fe676bb3 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18878
2009-12-10 14:48:45 +00:00
Marco Maggesi ec6f4788bb Fixed download url for Unison File Syncronizer.
svn path=/nixpkgs/trunk/; revision=18793
2009-12-03 16:40:18 +00:00
Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory
renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661
2009-11-26 21:46:08 +00:00
Eelco Dolstra 0df5c155c6 * Firefox 3.5.5.
svn path=/nixpkgs/trunk/; revision=18548
2009-11-22 22:40:39 +00:00
Rob Vermaas 132a1db1ee newer version of chrome (32599)
svn path=/nixpkgs/trunk/; revision=18520
2009-11-22 14:41:38 +00:00
Lluís Batlle i Rossell e85500987b Merging from trunk. I had to do two manual merges, quite trivial I think.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18472
2009-11-19 19:09:10 +00:00
Eelco Dolstra 7f5b839524 * Removed selectVersion. There's no good reason to write
`selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

svn path=/nixpkgs/trunk/; revision=18403
2009-11-18 09:39:59 +00:00
Lluís Batlle i Rossell 6864119104 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=18341
2009-11-13 19:19:34 +00:00