Commit graph

826 commits

Author SHA1 Message Date
Peter Simons
1451109c95 nbd: linking with -lrt is no longer necessary because we don't link glib statically anymore
svn path=/nixpkgs/trunk/; revision=32126
2012-02-07 19:54:28 +00:00
Peter Simons
a62fa4480a nbd: updated to version 2.9.25
svn path=/nixpkgs/trunk/; revision=32125
2012-02-07 19:54:25 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Eelco Dolstra
4fe11e8438 * OpenSSH updated to 5.9p1.
svn path=/nixpkgs/trunk/; revision=31939
2012-01-31 11:01:12 +00:00
Eelco Dolstra
3cf71dcfd1 * Curl is used during the bootstrap, so don't rely on pattern
substitution being efficient.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31792
2012-01-23 13:06:01 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Peter Simons
0f3fa64430 wicd: integrate with upstart events
quite some services need to be started/restarted when a connection is
established/teared down. Also, some services are optional depending on
the connected access point. For example: use a vpn on an untrusted
network.

these small trigger scripts don't change any behaviour by themselves,
but allow you to hook in to them if you need.

example use:

  jobs.gw6c.startOn = pkgs.lib.mkForce "started  openvpn-dcsOffice";
  jobs.gw6c.stopOn  = pkgs.lib.mkForce "stopping openvpn-dcsOffice";
  jobs."openvpn-dcsOffice".startOn        = pkgs.lib.mkForce "wicd-postconnect";
  jobs."openvpn-dcsOffice".stopOn         = pkgs.lib.mkForce "stopping network-interfaces or wicd-predisconnect";

In the example, I use 3 layers. When a physical connection is
available (wifi connect), I setup a vpn connection, and setup an ipv6
tunnel on top of that. When disconnecting, they are automatically shut
down in the right order as well.

svn path=/nixpkgs/trunk/; revision=31662
2012-01-18 20:38:34 +00:00
Peter Simons
8b3dd70553 openvpn: use iproute2 instead of net-tools
for setting up tunnel/routes.
I had some issues with ipv6, iproute2 fixed those.

Both are equally well supported by upstream.

svn path=/nixpkgs/trunk/; revision=31660
2012-01-18 20:38:27 +00:00
Peter Simons
3dd02a75ef openvpn: upgraded to latest version
svn path=/nixpkgs/trunk/; revision=31647
2012-01-18 20:32:17 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Shea Levy
8c063fdfc7 Fix tarball
svn path=/nixpkgs/trunk/; revision=31352
2012-01-06 16:14:02 +00:00
Eelco Dolstra
961ad6a314 * rp-pppoe requires a version attribute in ppp.
svn path=/nixpkgs/trunk/; revision=31295
2012-01-04 19:04:09 +00:00
Yury G. Kudryashov
3ca6582874 ppp-2.4.5, a few patches
svn path=/nixpkgs/trunk/; revision=31279
2012-01-04 15:10:27 +00:00
Yury G. Kudryashov
b3709689db Add modemmanager
svn path=/nixpkgs/trunk/; revision=31263
2012-01-04 09:05:22 +00:00
Yury G. Kudryashov
3af2d4a89e Add kde4.networkmanagement
You still need to start NetworkManager daemon manually to use this widget

svn path=/nixpkgs/trunk/; revision=31229
2012-01-03 13:39:09 +00:00
Lluís Batlle i Rossell
58af7eb6bf Adding smbldap-tools. And some CPAN packages as bonus.
svn path=/nixpkgs/trunk/; revision=31118
2011-12-27 21:35:50 +00:00
Lluís Batlle i Rossell
0def824532 Updating webalizer.
svn path=/nixpkgs/trunk/; revision=31105
2011-12-26 17:27:30 +00:00
Ludovic Courtès
79819a5262 Wicd: Protect the password in the WPA2-TTLS template.
svn path=/nixpkgs/trunk/; revision=30867
2011-12-13 14:54:15 +00:00
Eelco Dolstra
5ce6bf04f2 * vde2 updated to 2.3.2.
svn path=/nixpkgs/trunk/; revision=30804
2011-12-09 11:14:02 +00:00
Peter Simons
088470ef55 pkgs/tools/networking/p2p/rtorrent/default.nix: avoid use of "install -D" to make FreeBSD happy
svn path=/nixpkgs/trunk/; revision=30783
2011-12-06 20:44:31 +00:00
Ludovic Courtès
b7833639ba Seeks 0.4.0.
svn path=/nixpkgs/trunk/; revision=30729
2011-12-04 22:03:03 +00:00
Russell O'Connor
c9b2f32c45 Updating bitcoin to version 0.5.0.
svn path=/nixpkgs/trunk/; revision=30553
2011-11-24 19:48:20 +00:00
Rob Vermaas
e2fd2c4e23 openvpn: enable option to use password files
svn path=/nixpkgs/trunk/; revision=30461
2011-11-18 02:10:14 +00:00
Ludovic Courtès
0093d96841 GNU Wget: Prepare for cross-compilation of a stripped-down version.
svn path=/nixpkgs/trunk/; revision=30445
2011-11-16 14:48:27 +00:00
Lluís Batlle i Rossell
c761760442 Adding imapproxy
svn path=/nixpkgs/trunk/; revision=30360
2011-11-09 18:25:55 +00:00
Lluís Batlle i Rossell
d72fe9fee2 Adding prayer. It builds on linux x86_64, but I've not tried to run it.
svn path=/nixpkgs/trunk/; revision=30347
2011-11-08 21:07:57 +00:00
Lluís Batlle i Rossell
74ef91cfae Updating ntp
svn path=/nixpkgs/trunk/; revision=30290
2011-11-07 15:07:19 +00:00
Eelco Dolstra
4d95b41bc8 * curl updated to 7.22.0. Dropped the connect timeout patch because
it doesn't seem necessary anymore.

svn path=/nixpkgs/trunk/; revision=30243
2011-11-05 01:55:53 +00:00
Lluís Batlle i Rossell
15c16f50aa Adding dnstop
svn path=/nixpkgs/trunk/; revision=30209
2011-11-03 18:43:48 +00:00
Lluís Batlle i Rossell
d4b26a727a Updating unbound.
svn path=/nixpkgs/trunk/; revision=30174
2011-11-01 22:33:40 +00:00
Ludovic Courtès
929841f10a GNU Wget 1.13.4.
svn path=/nixpkgs/trunk/; revision=30121
2011-10-30 00:01:24 +00:00
Lluís Batlle i Rossell
cb823d1c08 Adding mu0, maildir utils.
svn path=/nixpkgs/trunk/; revision=29995
2011-10-24 16:36:03 +00:00
Peter Simons
85c97efc50 nbd: updated to version 2.9.24
svn path=/nixpkgs/trunk/; revision=29829
2011-10-13 17:00:46 +00:00
Joachim Schiele
f3f0940e25 added support for cntlm on nixos!
svn path=/nixpkgs/trunk/; revision=29736
2011-10-09 22:28:41 +00:00
Lluís Batlle i Rossell
afe142e963 Making jwhois connect fine for those without ipv6 network.
svn path=/nixpkgs/trunk/; revision=29519
2011-09-28 07:25:59 +00:00
Michael Raskin
0b9c88cba1 Taking a patch from ArchLinux to fix altermime build
svn path=/nixpkgs/trunk/; revision=29489
2011-09-26 04:48:35 +00:00
Yury G. Kudryashov
9dd3dbe2c7 fdm: remove -I- from GNUmakefile. Fixes build on i686
svn path=/nixpkgs/trunk/; revision=29485
2011-09-25 23:16:16 +00:00
Yury G. Kudryashov
fe3df64918 Add version info to bittornado.name
svn path=/nixpkgs/trunk/; revision=29483
2011-09-25 22:56:38 +00:00
Peter Simons
808aa6c62d rtorrent: install man page manually (the upstream makefile is broken)
svn path=/nixpkgs/trunk/; revision=29471
2011-09-24 12:46:24 +00:00
Michael Raskin
4d6030f56b Adding hyenae - patch by MarcWeber
svn path=/nixpkgs/trunk/; revision=29470
2011-09-24 09:14:21 +00:00
Lluís Batlle i Rossell
ddcb4a295d Adding pdnsd
svn path=/nixpkgs/trunk/; revision=29438
2011-09-22 11:28:56 +00:00
Michael Raskin
234a58870a Check bittornado with newer wxGTK, generic cleanup
svn path=/nixpkgs/trunk/; revision=29433
2011-09-22 06:31:35 +00:00
Florian Friesdorf
113f2c851f iodine-0.6.0-rc1
svn path=/nixpkgs/trunk/; revision=29429
2011-09-21 20:05:38 +00:00
Peter Simons
11e2fe77ce nbd: don't try to build this tool on Cygwin
svn path=/nixpkgs/trunk/; revision=29358
2011-09-19 17:02:15 +00:00
Peter Simons
2120523889 pdsh: don't try to build this tool on Cygwin
svn path=/nixpkgs/trunk/; revision=29357
2011-09-19 17:00:37 +00:00
Yury G. Kudryashov
284ffb7713 nm-applet-0.9.0
svn path=/nixpkgs/trunk/; revision=29272
2011-09-14 16:52:06 +00:00
Yury G. Kudryashov
5fd7590140 Add NetworkManager-pptp
svn path=/nixpkgs/trunk/; revision=29271
2011-09-14 15:50:14 +00:00
Yury G. Kudryashov
5aed28d802 Better propagated/native/ buildInputs separation
svn path=/nixpkgs/trunk/; revision=29270
2011-09-14 15:50:01 +00:00
Yury G. Kudryashov
1d91e3ac45 Add pptp client
svn path=/nixpkgs/trunk/; revision=29267
2011-09-14 08:39:51 +00:00
Peter Simons
a4239c7e14 tahoe-lafs: updated to version 1.8.3, which fixes an important security bug
Note that we currently cannot run the test suite!

svn path=/nixpkgs/trunk/; revision=29253
2011-09-13 20:10:41 +00:00
Yury G. Kudryashov
8c6b8753d5 NM: propagate dbus-glib
svn path=/nixpkgs/trunk/; revision=29247
2011-09-13 19:27:41 +00:00
Yury G. Kudryashov
ae94d87ef4 Trying to fix networkmanager
svn path=/nixpkgs/trunk/; revision=29160
2011-09-10 19:23:26 +00:00
Eelco Dolstra
55ae7b67d4 * radvd updated to 1.8.1.
svn path=/nixpkgs/trunk/; revision=29126
2011-09-09 13:16:35 +00:00
Ludovic Courtès
b9b268eb01 GNU Wget 1.13.3.
svn path=/nixpkgs/trunk/; revision=29010
2011-09-04 23:05:48 +00:00
Michael Raskin
6a01304317 Adding TFTP-HPA
svn path=/nixpkgs/trunk/; revision=28915
2011-08-30 07:02:01 +00:00
Peter Simons
ed03fadafc pkgs/tools/networking/p2p/gtk-gnutella/builder.sh: dropped obsolete file
svn path=/nixpkgs/trunk/; revision=28908
2011-08-29 22:21:29 +00:00
Peter Simons
482a61cf53 gtk-gnutella: updated to version 0.97
svn path=/nixpkgs/trunk/; revision=28883
2011-08-29 20:26:26 +00:00
Michael Raskin
6759fab01b Moving debian patch to fetchurl
svn path=/nixpkgs/trunk/; revision=28875
2011-08-29 13:17:44 +00:00
Michael Raskin
b612e07c0b Adding atftp
svn path=/nixpkgs/trunk/; revision=28874
2011-08-29 12:47:39 +00:00
Michael Raskin
946458d4f9 Fixing tarball build
svn path=/nixpkgs/trunk/; revision=28873
2011-08-29 10:31:10 +00:00
Michael Raskin
04e84c2c13 Adding netboot
svn path=/nixpkgs/trunk/; revision=28872
2011-08-29 10:16:36 +00:00
Eelco Dolstra
a97b8b191c * Added s3cmd.
svn path=/nixpkgs/trunk/; revision=28530
2011-08-13 11:49:23 +00:00
David Guibert
b97136492e isync: add recursive imap patch
svn path=/nixpkgs/trunk/; revision=28438
2011-08-09 20:09:17 +00:00
Peter Simons
62eab9e44a pdsh: updated to version 2.26
svn path=/nixpkgs/trunk/; revision=27858
2011-07-20 18:58:34 +00:00
Peter Simons
b9d382c2dd libtorrent: use sha256 hash returned by nix-prefetch-url
svn path=/nixpkgs/trunk/; revision=27827
2011-07-18 15:23:03 +00:00
Peter Simons
7c19a3a691 rtorrent: updated to version 0.8.9
svn path=/nixpkgs/trunk/; revision=27824
2011-07-18 14:34:46 +00:00
Peter Simons
21691b47d7 libtorrent: updated to version 0.12.9
svn path=/nixpkgs/trunk/; revision=27823
2011-07-18 14:34:33 +00:00
Peter Simons
132b87eced nbd: updated to 2.9.23
svn path=/nixpkgs/trunk/; revision=27675
2011-07-08 16:01:59 +00:00
Karn Kallio
cbb0e62780 Advance lftp to version 4.3.1
svn path=/nixpkgs/trunk/; revision=27579
2011-07-02 19:19:48 +00:00
Michael Raskin
e9d66565d7 Adding wavemon
svn path=/nixpkgs/trunk/; revision=27557
2011-06-29 09:53:35 +00:00
Ludovic Courtès
f45f45544e Seeks 0.3.3.
svn path=/nixpkgs/trunk/; revision=27556
2011-06-29 07:52:27 +00:00
Yury G. Kudryashov
4484bbfdd8 lftp-4.2.3, use tar.xz
svn path=/nixpkgs/trunk/; revision=27443
2011-06-13 22:14:06 +00:00
Michael Raskin
4157b77097 Adding siege HTTP load tester
svn path=/nixpkgs/trunk/; revision=27368
2011-06-07 16:15:05 +00:00
Peter Simons
47452c351b nbd: updated to version 2.9.22
svn path=/nixpkgs/trunk/; revision=27316
2011-05-30 20:08:18 +00:00
Russell O'Connor
aaa09472bc Update bitcoin to 0.3.21
svn path=/nixpkgs/trunk/; revision=27275
2011-05-17 11:34:18 +00:00
Peter Simons
bfa7c9791a nbd: disable test suite to avoid failures on Hydra (NixOS)
svn path=/nixpkgs/trunk/; revision=27251
2011-05-13 18:30:36 +00:00
Eelco Dolstra
80d963dee0 * OpenSSH 5.8p2.
svn path=/nixpkgs/trunk/; revision=27223
2011-05-11 13:44:18 +00:00
Peter Simons
faf10f25b5 nbd: enable doCheck
The test suite runs fine on my Linux machine, but let's wait and see what Hydra
has to say about that.

svn path=/nixpkgs/trunk/; revision=27221
2011-05-11 12:28:23 +00:00
Peter Simons
c2e197e11b nbd: updated to 2.9.21a
svn path=/nixpkgs/trunk/; revision=27220
2011-05-11 12:28:18 +00:00
Peter Simons
455d173010 nbd: updated to 2.9.21
svn path=/nixpkgs/trunk/; revision=27207
2011-05-10 07:15:58 +00:00
Lluís Batlle i Rossell
e169ba953d Updating openvpn
svn path=/nixpkgs/trunk/; revision=27153
2011-05-04 18:58:53 +00:00
Lluís Batlle i Rossell
68cb3535e1 Making openssh cross-build. And making linux-pam almost cross-build, I think.
This allows me to put sftp-server in the nanonote and use it through dropbear.


svn path=/nixpkgs/trunk/; revision=26971
2011-04-25 15:41:32 +00:00
Lluís Batlle i Rossell
06c5e48804 Now yes allowing the sftp server path in dropbear. I commit too early, clearly.
svn path=/nixpkgs/trunk/; revision=26970
2011-04-25 15:04:56 +00:00
Lluís Batlle i Rossell
a5923a2e13 Allow overriding the sftp server path.
svn path=/nixpkgs/trunk/; revision=26969
2011-04-25 15:03:13 +00:00
Lluís Batlle i Rossell
43c4e65c66 Now I patch dropbear properly for it to inherit the PATH.
svn path=/nixpkgs/trunk/; revision=26968
2011-04-25 14:57:46 +00:00
Lluís Batlle i Rossell
e1a78aa1a0 Making dropbear sessions inherit the PATH
svn path=/nixpkgs/trunk/; revision=26967
2011-04-25 14:40:10 +00:00
Lluís Batlle i Rossell
ee8b05eb70 Adding 'wakelan', to use UDP wake on lan on ethernet.
svn path=/nixpkgs/trunk/; revision=26912
2011-04-20 20:55:46 +00:00
Eelco Dolstra
b2c4b433b4 * Added libpar2 and nzbget.
svn path=/nixpkgs/trunk/; revision=26895
2011-04-19 20:35:24 +00:00
Nicolas Pierron
2cab2ce885 Fuppes: Fix support of faad2, backward compatibility macros were not
expanded in strings.

svn path=/nixpkgs/trunk/; revision=26864
2011-04-17 08:27:22 +00:00
Lluís Batlle i Rossell
f4b6ea9ebc the hpn-ssh needs -lgcc_s, because of its pthread_cancel at the end.
svn path=/nixpkgs/trunk/; revision=26833
2011-04-13 20:44:17 +00:00
Lluís Batlle i Rossell
49a08c4f97 Updating the hpn-ssh patch.
svn path=/nixpkgs/trunk/; revision=26831
2011-04-13 20:24:06 +00:00
Karn Kallio
422455271c GnuTLS now introduces a dependency on gmp.
-- also removed poorly considered earlier individual patches.

svn path=/nixpkgs/trunk/; revision=26810
2011-04-12 16:59:52 +00:00
Karn Kallio
e88ae7fa7d Pass libgcrypt and gmp to network manager.
svn path=/nixpkgs/trunk/; revision=26808
2011-04-12 16:31:51 +00:00
Michael Raskin
07fde1ab81 Fix BitTornado
svn path=/nixpkgs/trunk/; revision=26757
2011-04-08 14:59:29 +00:00
Lluís Batlle i Rossell
83556d37e9 Adding inadyn, a dynamic dns client.
svn path=/nixpkgs/trunk/; revision=26743
2011-04-07 20:26:26 +00:00
Russell O'Connor
78f9628037 wicd should no longer write into the nix store.
But it doesn't compile optimized bytecode. :(  I would be good if someone who actually knew python could give this package some love.

svn path=/nixpkgs/trunk/; revision=26742
2011-04-07 15:39:53 +00:00
Eelco Dolstra
687c2ccc17 * wicd updated to 1.7.1b2, which is compatible with Python 2.7.
svn path=/nixpkgs/trunk/; revision=26727
2011-04-06 22:06:00 +00:00
Eelco Dolstra
20a5c4d74a * ssmtp updated to 2.64. Also get rid of the cyclic symlink $out/lib/sendmail.
svn path=/nixpkgs/trunk/; revision=26711
2011-04-06 11:41:36 +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
Peter Simons
4eab75bb92 pdsh: updated to 2.25
svn path=/nixpkgs/trunk/; revision=26675
2011-04-04 09:28:00 +00:00
Eelco Dolstra
601aeb1aa8 * Make sure that dhclient properly sets the hostname after reboots.
svn path=/nixpkgs/branches/modular-python/; revision=26659
2011-04-01 15:04:20 +00:00
Eelco Dolstra
02b20395d5 * Added vlan, which provides the vconfig command.
svn path=/nixpkgs/branches/modular-python/; revision=26624
2011-03-31 11:10:00 +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
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
f119c267de * getmail: don't use pythonFull.
svn path=/nixpkgs/branches/modular-python/; revision=26566
2011-03-28 13:13:15 +00:00
Evgeny Egorochkin
27c14e39b7 nm-applet: packaged
svn path=/nixpkgs/trunk/; revision=26526
2011-03-26 18:18:32 +00:00
Evgeny Egorochkin
4e512751ae knetworkmanager: fix license
svn path=/nixpkgs/trunk/; revision=26525
2011-03-26 18:14:28 +00:00
Eelco Dolstra
a3fb3b00ce * ndisc6: use /var for rdnssd.
svn path=/nixpkgs/trunk/; revision=26495
2011-03-24 16:03:43 +00:00
Eelco Dolstra
6080181882 * dnssort requires Perl.
svn path=/nixpkgs/trunk/; revision=26494
2011-03-24 15:26:11 +00:00
Eelco Dolstra
be0d0b8a13 * Added ndisc6 (which contains IPv6 related commands such as ndisc6,
rdisc6 and rdnssd).

svn path=/nixpkgs/trunk/; revision=26492
2011-03-24 14:30:06 +00:00
Eelco Dolstra
7cbb426eae * dhclient: don't flush IPv6 addresses/routes.
svn path=/nixpkgs/trunk/; revision=26455
2011-03-22 12:55:55 +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
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
8dc531a5b7 * dnsmasq updated to 2.57.
svn path=/nixpkgs/trunk/; revision=26249
2011-03-10 13:35:19 +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
33b5637b37 * Added radvd, the Router Advertisement Daemon.
svn path=/nixpkgs/trunk/; revision=26032
2011-02-19 16:04:34 +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
4621178b75 aircrack-1.0-rc2 -> 1.1-1859 (current trunk)
latest stable does not compile with gcc 4.5

svn path=/nixpkgs/trunk/; revision=25972
2011-02-14 22:40:51 +00:00
Eelco Dolstra
8df800d92c * nbd: fix build.
svn path=/nixpkgs/branches/x-updates/; revision=25952
2011-02-14 10:24:18 +00:00
Karn Kallio
ad303411cc Advance lftp to current release version 4.1.3
svn path=/nixpkgs/trunk/; revision=25912
2011-02-11 18:05:35 +00:00
Eelco Dolstra
dd3d477d74 * DHCP 4.1.2.
svn path=/nixpkgs/trunk/; revision=25897
2011-02-11 12:24:24 +00:00
Eelco Dolstra
209939f6f2 * OpenSSH 5.8.
svn path=/nixpkgs/trunk/; revision=25808
2011-02-08 13:13:34 +00:00
Lluís Batlle i Rossell
65968c289a Adding isync
svn path=/nixpkgs/trunk/; revision=25798
2011-02-07 23:07:21 +00:00
Peter Simons
de867f283d pkgs/tools/networking/nbd: updated to version 2.9.20
svn path=/nixpkgs/trunk/; revision=25769
2011-02-03 12:36:19 +00:00
Nicolas Pierron
08fd6e32c9 Add fuppes-0.660: UPnP A/V Media Server.
svn path=/nixpkgs/trunk/; revision=25728
2011-01-30 16:45:42 +00:00
Ludovic Courtès
f0345dd48c Seeks 0.3.1.
svn path=/nixpkgs/trunk/; revision=25638
2011-01-19 22:56:31 +00:00
Ludovic Courtès
80a9a7f8bb Wicd: Add a template for WPA2-TTLS.
svn path=/nixpkgs/trunk/; revision=25534
2011-01-13 10:03:20 +00:00
Eelco Dolstra
d82dc5c965 * Added vde2 (Virtual Distributed Ethernet).
svn path=/nixpkgs/trunk/; revision=25518
2011-01-12 13:39:17 +00:00
David Guibert
6fa69548b1 aria2: 1.9.3 -> 1.10.8
svn path=/nixpkgs/trunk/; revision=25505
2011-01-11 13:42:49 +00:00
Michael Raskin
f9a6c93d43 Adding mtr.
svn path=/nixpkgs/trunk/; revision=25495
2011-01-10 15:57:23 +00:00
Evgeny Egorochkin
180205a431 knetwork-manager: package and enable support in KDE to see what is going to break.
svn path=/nixpkgs/trunk/; revision=25375
2011-01-04 00:28:22 +00:00
Evgeny Egorochkin
857ea5f7cd network-manager: try fixing compilation for x86_64-linux.
svn path=/nixpkgs/trunk/; revision=25374
2011-01-03 22:34:50 +00:00
Yury G. Kudryashov
45b8ce020f network-manager: use mirror://gnome
svn path=/nixpkgs/trunk/; revision=25371
2011-01-03 19:10:01 +00:00
Evgeny Egorochkin
9b50ebd825 network-manager: packaged, maybe even works.
svn path=/nixpkgs/trunk/; revision=25367
2011-01-03 18:01:10 +00:00
Eelco Dolstra
c1eb464f3c * Build those Python modules in the Python distribution that require
additional dependencies (e.g. SQLite, X11, or Tcl/Tk) outside the
  main Python package (i.e., pythonBase).  This makes pythonFull
  unnecessary: you can just pass the additional modules as
  buildInputs to packages that require them, e.g.

    buildInputs = [ pythonModules.sqlite3 ];

svn path=/nixpkgs/branches/modular-python/; revision=25364
2011-01-03 16:25:11 +00:00
Peter Simons
b5f00acee2 pkgs/tools/networking/pdsh: updated to version 2.23
svn path=/nixpkgs/trunk/; revision=25329
2011-01-01 14:51:53 +00:00
Eelco Dolstra
aceef005c3 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25244
2010-12-22 17:02:03 +00:00
Lluís Batlle i Rossell
a34fd23fc1 Fixing the openvpn url.
svn path=/nixpkgs/trunk/; revision=25239
2010-12-22 14:03:55 +00:00
Lluís Batlle i Rossell
9b59178909 Updating openvpn
svn path=/nixpkgs/trunk/; revision=25237
2010-12-22 13:34:19 +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
Russell O'Connor
d07675c415 Maybe this will fix wicd.
svn path=/nixpkgs/trunk/; revision=24933
2010-11-30 04:09:51 +00:00
Russell O'Connor
7f65afe3f3 Update wicd to 1.7.0
svn path=/nixpkgs/trunk/; revision=24929
2010-11-29 20:15:44 +00:00
Eelco Dolstra
6ff77b7f6c * tcpdump 4.1.1.
svn path=/nixpkgs/trunk/; revision=24919
2010-11-29 15:25:07 +00:00
Tobias Hammerschmidt
57c1632f11 added flvstreamer
svn path=/nixpkgs/trunk/; revision=24884
2010-11-26 20:04:07 +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
Ludovic Courtès
9feaed78d2 ncftp: Get the source from Debian.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24664
2010-11-11 17:32:53 +00:00
Michael Raskin
df2d680da8 Kill -I- in fdm
svn path=/nixpkgs/branches/stdenv-updates/; revision=24643
2010-11-10 16:14:18 +00:00
Peter Simons
d5abf27257 pkgs/tools/networking/pdsh: fixed location of "info" and "man" directories
svn path=/nixpkgs/trunk/; revision=24604
2010-11-05 14:35:30 +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
Ludovic Courtès
5c2974a0af Seeks 0.3.0.
svn path=/nixpkgs/trunk/; revision=24549
2010-10-30 21:44:36 +00:00
Peter Simons
e08d173663 pdsh: updated to version 2.22
svn path=/nixpkgs/trunk/; revision=24539
2010-10-30 09:51:38 +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
Michael Raskin
8413c96cde Fix dependency
svn path=/nixpkgs/trunk/; revision=24412
2010-10-22 06:36:45 +00:00
Michael Raskin
fb8e4c950f Adding fdm
svn path=/nixpkgs/trunk/; revision=24409
2010-10-21 22:03:36 +00:00
Michael Raskin
ac19af507f Adding Linux 2.6.36
svn path=/nixpkgs/trunk/; revision=24403
2010-10-21 12:28:14 +00:00
Michael Raskin
bc73cd0f7e Add ripmime - MIME attachment extractor tool
svn path=/nixpkgs/trunk/; revision=24337
2010-10-18 09:43:17 +00:00
Michael Raskin
b2e9e9757c Adding philter mail sorter
svn path=/nixpkgs/trunk/; revision=24336
2010-10-18 05:33:31 +00:00
Michael Raskin
e53d966a21 Add getmail
svn path=/nixpkgs/trunk/; revision=24334
2010-10-17 19:30:59 +00:00
Eelco Dolstra
48229f2b0d * dnsmasq updated to 2.55.
svn path=/nixpkgs/trunk/; revision=24222
2010-10-11 19:30:54 +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
Ludovic Courtès
89a3dc9ada nss-mdns: Fix the path to the `avahi-daemon' socket.
svn path=/nixpkgs/trunk/; revision=24149
2010-10-07 20:07:59 +00:00
Peter Simons
73a08a1914 pkgs/tools/networking/x11-ssh-askpass: capitalize first letter of meta.description
svn path=/nixpkgs/trunk/; revision=24144
2010-10-07 14:05:19 +00:00
Peter Simons
113075207e pkgs/tools/networking/x11-ssh-askpass: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=24141
2010-10-07 13:14:21 +00:00
Peter Simons
a158e67b19 pkgs/tools/networking/x11-ssh-askpass: added meta section
svn path=/nixpkgs/trunk/; revision=24135
2010-10-07 13:13:57 +00:00
Eelco Dolstra
4e94575014 * NTP updated to 4.2.6p2.
svn path=/nixpkgs/trunk/; revision=24118
2010-10-06 16:02:44 +00:00
Lluís Batlle i Rossell
8d435fd90f Updating the src url of offlineimap (to the only version there available)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24037
2010-10-03 09:19:04 +00:00
Lluís Batlle i Rossell
bb0351b562 Making iftop build on the fuloong (config.guess.)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24036
2010-10-03 09:18:55 +00:00
Lluís Batlle i Rossell
257f7bbb9a Updating the src url of offlineimap (to the only version there available)
svn path=/nixpkgs/trunk/; revision=23975
2010-09-27 21:01:16 +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
Ludovic Courtès
9fd0fdebd9 GNU Mailutils 2.2.
svn path=/nixpkgs/trunk/; revision=23713
2010-09-10 11:50:11 +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
6e0911c3cb * Doh.
svn path=/nixpkgs/trunk/; revision=23463
2010-08-26 13:18:47 +00:00
Eelco Dolstra
fee41ba2fb * Make sitecopy build against Neon 0.29.
svn path=/nixpkgs/trunk/; revision=23461
2010-08-26 13:09:52 +00:00
Eelco Dolstra
412bd09ec1 * OpenSSH 5.6.
svn path=/nixpkgs/trunk/; revision=23432
2010-08-25 21:12:36 +00:00
Lluís Batlle i Rossell
221317ae7b Setting new bootstrap-tools for x86_64.
Allowing 'curl' build without some dependencies, if it is told not to build
with them.

Updating the make-bootstrap-tools for the latest gcc/glibc, removing the
dependency on klibc, and updating unpack-boostrap-tools for the latest
boostrap-tools to work.


svn path=/nixpkgs/branches/stdenv-updates/; revision=23305
2010-08-21 12:50:49 +00:00
Peter Simons
9be0b9fea6 Update version of ncftp.
The old version 3.2.3 seems to have disappeared from the hosting server.

svn path=/nixpkgs/trunk/; revision=23153
2010-08-12 14:57:15 +00:00
Peter Simons
b62f65d24e pkgs/tools/networking/nbd: removed hard-coded flags for static linking
A statically linked binary should rather be generated using the
appropriate stdenv adapter.

svn path=/nixpkgs/trunk/; revision=23107
2010-08-11 09:54:46 +00:00
Peter Simons
e33f4863fc pkgs/tools/networking/nbd: updated to version 2.9.18
svn path=/nixpkgs/trunk/; revision=23106
2010-08-11 09:53:31 +00:00
Peter Simons
0571d80df6 pkgs/tools/networking/curl: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=22997
2010-08-06 12:45:39 +00:00
Peter Simons
432ad9ceef pkgs/tools/networking/curl: assert that scpSupport is enabled only when libssh2 is available
svn path=/nixpkgs/trunk/; revision=22996
2010-08-06 12:45:11 +00:00
Peter Simons
401b77d232 pkgs/tools/networking/nbd: updated to version 2.9.17
svn path=/nixpkgs/trunk/; revision=22994
2010-08-06 12:43:18 +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
Yury G. Kudryashov
80108f291b Add optional scp support to curl
svn path=/nixpkgs/trunk/; revision=22976
2010-08-05 21:06:45 +00:00
Peter Simons
43017234d6 pkgs/tools/networking/nbd: enable build on all NixOS platforms
The nbd client needs kernel support and is available only on Linux, but
the server process ought to work in all POSIX'ish environments.

svn path=/nixpkgs/trunk/; revision=22936
2010-08-03 19:08:11 +00:00
Peter Simons
c820859eac pkgs/tools/networking/nbd: revert "enable regression tests"
test suite failure on hydra: http://hydra.nixos.org/build/518375

svn path=/nixpkgs/trunk/; revision=22935
2010-08-03 18:12:38 +00:00
Peter Simons
057a044b0c pkgs/tools/networking/nbd: enable regression tests
The tests suite succeeds fine on Linux/x86. Let's see what happens on
other platforms.

svn path=/nixpkgs/trunk/; revision=22920
2010-08-03 09:36:37 +00:00
Peter Simons
cdb12ec708 pkgs/tools/networking/nbd: updated to version 2.9.16
svn path=/nixpkgs/trunk/; revision=22919
2010-08-03 09:32:05 +00:00
Peter Simons
9ef0f1b935 pkgs/tools/networking/nbd: install the README file to $out/share/doc
The README contains documentation that is useful in addition to the man
pages.

svn path=/nixpkgs/trunk/; revision=22875
2010-08-02 13:37:36 +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
Peter Simons
4b248a36b0 pkgs/tools/networking/nbd: updated to version 2.9.15
svn path=/nixpkgs/trunk/; revision=22799
2010-07-28 21:28:23 +00:00
Eelco Dolstra
f1598a8941 * More cleanup.
svn path=/nixpkgs/trunk/; revision=22798
2010-07-28 18:01:17 +00:00
Eelco Dolstra
749b8607ca * More cleanup.
svn path=/nixpkgs/trunk/; revision=22795
2010-07-28 15:35:01 +00:00
Peter Simons
93ff8697d1 pkgs/tools/networking/p2p/tahoe-lafs: add mock060 to propagatedBuildInputs
The package is required for the regression test suite. Adding it to
buildInputs would probably work, too, but I haven't tried it.

svn path=/nixpkgs/trunk/; revision=22792
2010-07-28 13:09:20 +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
Peter Simons
1bb86133c7 pkgs/tools/networking/p2p/tahoe-lafs: updated to version 1.7.1
svn path=/nixpkgs/trunk/; revision=22774
2010-07-27 23:52:22 +00:00
Ludovic Courtès
8297acd511 Add Seeks, a "social" search engine.
svn path=/nixpkgs/trunk/; revision=22698
2010-07-22 09:03:35 +00:00
Eelco Dolstra
113fa71b8c * curl updated to 7.21.0.
svn path=/nixpkgs/trunk/; revision=22629
2010-07-18 21:01:17 +00:00
Eelco Dolstra
5a028270aa * dhcp 4.1.1.
svn path=/nixpkgs/trunk/; revision=22606
2010-07-15 11:06:30 +00:00
Michael Raskin
ccc497f80d Make WebKit use libsoup 2.31.2 via deepOverride. Edit a few packages that were overridable but did not allow extra arguments. Remove a catch with deepOverride that pkgs.lib had this attribute in a different sense.
svn path=/nixpkgs/trunk/; revision=22529
2010-07-08 13:25:52 +00:00
Lluís Batlle i Rossell
26dc245fb2 Updating rtorrent and libtorrent
svn path=/nixpkgs/trunk/; revision=22518
2010-07-07 21:11:07 +00:00
David Guibert
e9234ae7bb offlineimap: 6.2.0.1
svn path=/nixpkgs/trunk/; revision=22385
2010-06-22 19:49:12 +00:00
Evgeny Egorochkin
4719a2ed3c Added flags to compile amule daemon and remote gui
svn path=/nixpkgs/trunk/; revision=22334
2010-06-19 02:19:39 +00:00
Eelco Dolstra
b88adf69c3 * socat updated to 1.7.1.2.
svn path=/nixpkgs/trunk/; revision=22252
2010-06-14 08:01:38 +00:00
David Guibert
66c784d4dd added autossh 1.4b.
svn path=/nixpkgs/trunk/; revision=22018
2010-05-27 19:43:57 +00:00
Eelco Dolstra
fa94d434a1 * Install the manpage.
svn path=/nixpkgs/trunk/; revision=21931
2010-05-20 23:06:10 +00:00
Eelco Dolstra
50712e5279 * Added miniupnpd, an implementation of the UPnP Internet Gateway
Device (IGD) specification.
* Updated iptables to 1.4.8.

svn path=/nixpkgs/trunk/; revision=21929
2010-05-20 22:11:44 +00:00
Eelco Dolstra
3dd55eef23 * Added aria2, a download utility.
svn path=/nixpkgs/trunk/; revision=21912
2010-05-20 11:11:24 +00:00
Eelco Dolstra
90b3af3bd7 * Bittorrent updated to 5.2.2 (5.3 seems too hard to build).
svn path=/nixpkgs/trunk/; revision=21877
2010-05-19 14:42:52 +00:00
Eelco Dolstra
f8a818bf20 * Remove a redundant version of ktorrent (it's already in
kde/extra-gear).

svn path=/nixpkgs/trunk/; revision=21876
2010-05-19 13:57:20 +00:00
Peter Simons
3353ed9c88 pkgs/top-level/all-packages.nix, pkgs/tools/networking/openssh: prefer makeOverridable over getPkgConfig to customize openssh
Changed 'openssh' expression to allow for argument overriding instead of
relying on getPkgConfig. While I was at it, I also simplified the build
expression a bit.

svn path=/nixpkgs/trunk/; revision=21868
2010-05-19 12:26:06 +00:00
Ludovic Courtès
38c35ba49b GNU Inetutils 1.8.
svn path=/nixpkgs/trunk/; revision=21814
2010-05-17 09:31:43 +00:00
Lluís Batlle i Rossell
70302d2d18 Adding inputs to privoxy, so it gets more features (zlib, documentation, pcre)
svn path=/nixpkgs/trunk/; revision=21809
2010-05-16 22:14:02 +00:00
Peter Simons
fd8c6ae43d Moved 'maintainers' attribute into the meta section of the expression.
I've also set the 'platforms' attribute to ensure that Hydra actually
builds these packages. Thanks to Lluís Batlle i Rossell for pointing out
these mistakes.

svn path=/nixpkgs/trunk/; revision=21688
2010-05-09 16:01:44 +00:00
Lluís Batlle i Rossell
8b311ba757 Adding the openssh patch I forgot in a recent commit
svn path=/nixpkgs/trunk/; revision=21681
2010-05-09 12:53:46 +00:00
Lluís Batlle i Rossell
b7af00b889 Making openssh pass the LOCALE_ARCHIVE variable to the forked session processes,
so the session 'bash' will receive the proper locale archive, and thus process
UTF-8 properly.

svn path=/nixpkgs/trunk/; revision=21678
2010-05-09 12:44:09 +00:00
Lluís Batlle i Rossell
c12db8f8dc I wrote wrong the openssh url. Btw, I changed the source server, because the old
mirror at Ultrech did not have the latest openssh even 6 days after the
5.5 release.

svn path=/nixpkgs/trunk/; revision=21247
2010-04-22 20:12:09 +00:00
Lluís Batlle i Rossell
5d04ec0364 Updating openssh, fixing libedit for openssh to link well with it, and... here we
finally have sftp with some kind of 'readline'!

svn path=/nixpkgs/trunk/; revision=21246
2010-04-22 18:16:18 +00:00
Ludovic Courtès
d1c19b4049 GNU wget: Fix test suite runs.
svn path=/nixpkgs/trunk/; revision=21057
2010-04-13 10:11:42 +00:00
Lluís Batlle i Rossell
b6fe7e6d41 Adding offlineimap, in a not very elegant way.
svn path=/nixpkgs/trunk/; revision=21034
2010-04-12 21:03:22 +00:00
Peter Simons
0526f2fb2c pkgs/tools/networking/pdsh: added myself as a maintainer
svn path=/nixpkgs/trunk/; revision=21027
2010-04-12 11:21:34 +00:00
Lluís Batlle i Rossell
a2334e604b Adding slimrat (not the gui, but at least the cli)
svn path=/nixpkgs/trunk/; revision=20999
2010-04-10 10:47:30 +00:00
Armijn Hemel
f7ab7efff1 update tcpdump to 4.1.0, libpcap to 1.1.0
svn path=/nixpkgs/trunk/; revision=20938
2010-04-04 14:57:26 +00:00
Armijn Hemel
155515f076 update to 2.0.19
svn path=/nixpkgs/trunk/; revision=20937
2010-04-04 14:51:37 +00:00
Armijn Hemel
589aeb4c00 update to 2.4
svn path=/nixpkgs/trunk/; revision=20936
2010-04-04 14:44:14 +00:00
Ludovic Courtès
c936e89fc1 aMule 2.2.6.
svn path=/nixpkgs/trunk/; revision=20866
2010-03-30 08:20:29 +00:00
Eelco Dolstra
b377b0233b * OpenSSH updated to 5.4.
svn path=/nixpkgs/trunk/; revision=20567
2010-03-11 16:08:55 +00:00
Lluís Batlle i Rossell
4a44d32444 Made tcpdump crossbuild.
svn path=/nixpkgs/trunk/; revision=20543
2010-03-10 22:22:43 +00:00
Lluís Batlle i Rossell
12e960f592 Adding dropbear, a small implementation of ssh2 client and server.
I made it statically build by default

I had to fix the zlib static cross-build, because the native stripping corrupted the target
static library. It is not the first time I see this.

I add drobear to the cross-built packages for hydra.


svn path=/nixpkgs/trunk/; revision=20518
2010-03-09 23:11:12 +00:00
Eelco Dolstra
c7b9e45e76 * Added s3sync.
svn path=/nixpkgs/trunk/; revision=20496
2010-03-09 15:12:15 +00:00
Michael Raskin
993588515f We use Python 2.6 now
svn path=/nixpkgs/trunk/; revision=20478
2010-03-08 20:35:25 +00:00
Lluís Batlle i Rossell
49ba7bee3c Made curl cross-build properly with openssl support.
svn path=/nixpkgs/trunk/; revision=20452
2010-03-06 15:17:43 +00:00
Ludovic Courtès
c2f72b3ba5 Tahoe-LAFS 1.6.1.
svn path=/nixpkgs/trunk/; revision=20323
2010-03-02 12:46:50 +00:00
Rob Vermaas
3e9de0fd12 * nixpkgs: added webalizer
svn path=/nixpkgs/trunk/; revision=20253
2010-02-25 13:30:34 +00:00
Lluís Batlle i Rossell
c812574385 Removing a now unneeded CMAKE_PREFIX_PATH in ktorrent
svn path=/nixpkgs/trunk/; revision=19966
2010-02-12 22:30:06 +00:00
Lluís Batlle i Rossell
8bfde9d310 Updating openvpn to a non-release_candidate newer version, and becoming maintainer.
svn path=/nixpkgs/trunk/; revision=19941
2010-02-11 16:45:19 +00:00
Rob Vermaas
5c66bbab77 wrong URL
svn path=/nixpkgs/trunk/; revision=19874
2010-02-09 10:17:13 +00:00
Rob Vermaas
3d841892a7 unbound 1.4.1
svn path=/nixpkgs/trunk/; revision=19870
2010-02-09 07:28:32 +00:00
Eelco Dolstra
d8c6bb130c * Sync with the trunk one last time.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19849
2010-02-05 23:06:36 +00:00
Eelco Dolstra
aee659e1e2 * Fix various broken URLs / mirrors.
* Updated tcpdump, ImageMagick, lsof.

svn path=/nixpkgs/trunk/; revision=19847
2010-02-05 22:00:51 +00:00
Lluís Batlle i Rossell
df0800e91d Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19825
2010-02-04 19:08:28 +00:00
Ludovic Courtès
b46d05da85 Tahoe-LAFS: Hopefully fix subtle test suite bug.
svn path=/nixpkgs/trunk/; revision=19801
2010-02-03 23:38:12 +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
Ludovic Courtès
b5088abe20 Tahoe-LAFS 1.6.0.
svn path=/nixpkgs/trunk/; revision=19784
2010-02-03 13:38:03 +00:00
Eelco Dolstra
0e212964fb * openssh: Install the moduli file.
svn path=/nixpkgs/trunk/; revision=19753
2010-02-01 17:04:07 +00:00
Eelco Dolstra
947e2c71ad * openssh updated to 5.3p1. Also enabled the HPN patch by default.
svn path=/nixpkgs/trunk/; revision=19752
2010-02-01 16:56:10 +00:00
Armijn Hemel
0e55350a85 update ktorrent to 3.3.3, also make it depend on KDE 4.3
svn path=/nixpkgs/trunk/; revision=19737
2010-01-30 19:30:30 +00:00
Eelco Dolstra
d068c0dd50 * ktorrent 2.2.8.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19675
2010-01-26 15:05:02 +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
Ludovic Courtès
f6c80710f5 Add SWEC (Simple Web Error Checker).
svn path=/nixpkgs/trunk/; revision=19637
2010-01-24 19:07:16 +00:00
Eelco Dolstra
9761d31dc9 * curl 7.19.7.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19573
2010-01-20 14:26:19 +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
Eelco Dolstra
56babc131d * inetutils: traceroute also needs a chmod +x.
svn path=/nixpkgs/trunk/; revision=19393
2010-01-13 13:46:22 +00:00
Lluís Batlle i Rossell
a16865ce62 Adding fix for wicd, sent by roconnor to nix-dev.
svn path=/nixpkgs/trunk/; revision=19345
2010-01-11 07:50:03 +00:00
Lluís Batlle i Rossell
9c8c4159b5 Fixing the style in the wicd expression, based on the recommendations
made by ludo in the mailing list.


svn path=/nixpkgs/trunk/; revision=19342
2010-01-10 20:27:28 +00:00
Lluís Batlle i Rossell
3a400bb64a Adding wicd, written by roconnor, sent to the nix-dev list on 2010-01-07
svn path=/nixpkgs/trunk/; revision=19297
2010-01-07 17:49:45 +00:00
Eelco Dolstra
5b098479f5 * socat updated to 1.7.1.1.
svn path=/nixpkgs/trunk/; revision=19269
2010-01-06 17:36:33 +00:00
Lluís Batlle i Rossell
c0d379f69a Made dhcp build (removing its -Werror). gcc 4.4 complained on uninitializated
variables.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19079
2009-12-23 08:55:32 +00:00
Lluís Batlle i Rossell
5bae851b1e Merging from trunk. I had to give away some structure to build the native
sheevaplug kernel, so the kernel does not build in the sheevaplug right now.
I will try to fix that in next commits.


svn path=/nixpkgs/branches/stdenv-updates/; revision=19045
2009-12-19 11:14:16 +00:00
Ludovic Courtès
9ba4676ae1 GNU Inetutils 1.7.
svn path=/nixpkgs/trunk/; revision=19005
2009-12-16 22:56:44 +00:00
Lluís Batlle i Rossell
5cbd244265 Updating ntp.
svn path=/nixpkgs/trunk/; revision=18916
2009-12-12 19:48:12 +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
Eelco Dolstra
c726012afe * Refactoring: move most filesystem utilities / FUSE filesystems to
tools/filesystems.  Previously they were all over the place.

svn path=/nixpkgs/trunk/; revision=18809
2009-12-04 15:39:49 +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
Michael Raskin
bbd6e56d69 Fix the cleanup-induced problems
svn path=/nixpkgs/trunk/; revision=18554
2009-11-23 12:21:34 +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
4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Lluís Batlle i Rossell
3cc62cefa8 Finally I decided to add High Performance SSH.
http://www.psc.edu/networking/projects/hpn-ssh/

I tried to keep the openssh hash not changing, unless the user sets hpn in getConfig
style. I think that does not look as good as a patch changing the hash, but it may
annoy less. Let me know if it is not ok.

I don't think hpn should be the default, because it may have some insecurity implications
I don't know of. But I used to enable it in all my machines, and I hope to do so unless
advised otherwise.

svn path=/nixpkgs/trunk/; revision=18073
2009-11-02 21:49:06 +00:00
Ludovic Courtès
061daca90c Rename Tahoe to Tahoe-LAFS.
svn path=/nixpkgs/trunk/; revision=18059
2009-10-31 22:34:24 +00:00
Marc Weber
1db4de344d adding stun
svn path=/nixpkgs/trunk/; revision=17860
2009-10-18 04:43:45 +00:00
Rob Vermaas
6132b946ac added eggdrop, iftop
svn path=/nixpkgs/trunk/; revision=17710
2009-10-08 07:01:55 +00:00
Rob Vermaas
3e8d1bbe6f coreutils not needed as input for privoxy
svn path=/nixpkgs/trunk/; revision=17647
2009-10-05 15:56:36 +00:00
Rob Vermaas
b7321eddce added privoxy
svn path=/nixpkgs/trunk/; revision=17645
2009-10-05 14:15:28 +00:00
Sander van der Burg
4b80c924ca openssl support or sitecopy
svn path=/nixpkgs/trunk/; revision=17640
2009-10-05 12:21:50 +00:00
Rob Vermaas
163cceeb54 ssl support for sitecopy
svn path=/nixpkgs/trunk/; revision=17639
2009-10-05 12:18:51 +00:00
Rob Vermaas
bd4ef3cbfc added sitecopy
svn path=/nixpkgs/trunk/; revision=17638
2009-10-05 10:37:30 +00:00
Lluís Batlle i Rossell
5704c1854d Fixing openssh build, so it doesn't try to put anything in /etc/ssh (and of course, it doesn't
fail if /etc/ssh/sshd_config can't be overwritten, which was my main motivation on this patch)

svn path=/nixpkgs/trunk/; revision=17573
2009-10-01 13:06:41 +00:00
Peter Simons
9a833f026b OpenSSH: allow users to configure --sysconfdir via $NIXPKGS_CONFIG
The OpenSSH binaries built by the expression by default expect system-wide
configuration files in "/etc/ssh", which is a bit of an impurity (and certainly
inconsistent with the way other package handle --sysconfdir in Nix). Those who
prefer a clean installation, can now configure that directory path.

Adding the line "openssh = { etcDir = null; };" to $NIXPKGS_CONFIG configures
OpenSSH to use the default location, i.e. $out/etc. Setting that attribute to a
string will configure OpenSSH to use that concrete path instead.

svn path=/nixpkgs/trunk/; revision=17570
2009-10-01 12:07:33 +00:00
Eelco Dolstra
0a7708ff56 * dhcp: don't bring down an interface to delete old addresses / route
/ ARP cache information, but just flush those using the ip command.
  Bringing down wireless interfaces causes wpa_supplicant to fail and
  never recover ("wpa_supplicant: l2_packet_receive - recvfrom:
  Network is down").  This made associating with a wireless network
  rather unreliable and timing-dependant.  It seems to work a lot
  better now.

svn path=/nixpkgs/trunk/; revision=17514
2009-09-29 16:14:33 +00:00
Peter Simons
045e10fe15 Link nbd package statically.
svn path=/nixpkgs/trunk/; revision=17470
2009-09-28 15:10:55 +00:00
Peter Simons
4dc1e7ba44 Network Block Device (nbd): initial version 2.9.13
svn path=/nixpkgs/trunk/; revision=17414
2009-09-25 02:09:43 +00:00
Rob Vermaas
c3fe985546 * added ncftp
svn path=/nixpkgs/trunk/; revision=17214
2009-09-17 07:31:34 +00:00
Rob Vermaas
5d6ee123ed ddclient
svn path=/nixpkgs/trunk/; revision=17181
2009-09-16 11:27:18 +00:00
Ludovic Courtès
f9a44eb4aa Mailutils: Restrict to GNU platforms.
svn path=/nixpkgs/trunk/; revision=17072
2009-09-12 20:53:21 +00:00
Ludovic Courtès
e94e1de693 Mailutils: Add home page.
svn path=/nixpkgs/trunk/; revision=17071
2009-09-12 19:54:08 +00:00
Ludovic Courtès
a6ab726b0f Try to build Mailutils everywhere.
svn path=/nixpkgs/trunk/; revision=17070
2009-09-12 18:47:34 +00:00
Ludovic Courtès
0d362f72ba Add GNU Mailutils 2.1.
svn path=/nixpkgs/trunk/; revision=17041
2009-09-11 09:38:25 +00:00
Ludovic Courtès
e5eb79cee4 lsh: Fix typo.
svn path=/nixpkgs/trunk/; revision=16986
2009-09-08 10:31:07 +00:00
Ludovic Courtès
80e34c69f5 lsh: Use GNU URL; handle --no-root-login' in lshd'.
svn path=/nixpkgs/trunk/; revision=16985
2009-09-08 10:29:22 +00:00
Ludovic Courtès
26bd10a892 lsh: Help `lsh-make-seed' gather more entropy.
svn path=/nixpkgs/trunk/; revision=16978
2009-09-07 13:45:06 +00:00
Michael Raskin
3d7152db82 Fix /sbin/ reference. On Linux just replace it with an "ip link" reference
svn path=/nixpkgs/trunk/; revision=16918
2009-09-01 22:42:05 +00:00
Michael Raskin
043fe38f80 Enable some features in gvpe
svn path=/nixpkgs/trunk/; revision=16915
2009-09-01 21:00:34 +00:00
Michael Raskin
ef6a270501 Adding GVPE - a protected virtual multinode ethernet
svn path=/nixpkgs/trunk/; revision=16913
2009-09-01 20:12:01 +00:00
Michael Raskin
11e09ffad1 Adding GlusterFS - a distributed storage system
svn path=/nixpkgs/trunk/; revision=16896
2009-08-31 09:52:01 +00:00
Marc Weber
16b2e9f951 updating libtorrent and rtorrent making both compile on x86_64
svn path=/nixpkgs/trunk/; revision=16791
2009-08-20 20:19:06 +00:00
Lluís Batlle i Rossell
c06da1dce7 Adding netkit tftp client and server.
svn path=/nixpkgs/trunk/; revision=16780
2009-08-19 20:19:27 +00:00
Ludovic Courtès
775f5b05fc Tahoe: Install the doc.
svn path=/nixpkgs/trunk/; revision=16676
2009-08-11 16:26:12 +00:00
Eelco Dolstra
6344a8d374 * cksfv 1.3.14.
svn path=/nixpkgs/trunk/; revision=16673
2009-08-11 13:49:13 +00:00
Ludovic Courtès
054c8237e7 Tahoe 1.5.0.
svn path=/nixpkgs/trunk/; revision=16666
2009-08-11 08:11:13 +00:00
Michael Raskin
b0e71363d1 Make dhclient work again
svn path=/nixpkgs/trunk/; revision=16517
2009-07-30 10:04:48 +00:00
Eelco Dolstra
869c2efec0 * dhcp updated to 4.1.0p1. This seems to fix my problems with
wpa_supplicant (i.e. the dhclient-script no longer brings down the
  wlan0 interface).  The patches no longer seem needed.

svn path=/nixpkgs/trunk/; revision=16449
2009-07-23 23:57:11 +00:00
Eelco Dolstra
9075d2a2cd * dhcpcd, another DHCP client (not tested). Hopefully it works better
than dhclient in conjunction with wpa_supplicant.

svn path=/nixpkgs/trunk/; revision=16411
2009-07-17 11:41:19 +00:00
Peter Simons
499c69c32c pdsh used to fail with an error because it couldn't locate libgcc_s.so.1.
Adding NIX_LDFLAGS="-lgcc_s" to the expression remedies that problem. Arguably,
though, this is a bad solution.

svn path=/nixpkgs/trunk/; revision=16239
2009-07-08 09:24:01 +00:00
Ludovic Courtès
0dcce7669e Tahoe: Use pysqlite', used by the backup' command.
svn path=/nixpkgs/trunk/; revision=16231
2009-07-07 22:44:29 +00:00
Ludovic Courtès
d0c6b200e0 Add Tahoe, a decentralized, fault-tolerant file system.
svn path=/nixpkgs/trunk/; revision=16082
2009-06-28 21:03:00 +00:00
Lluís Batlle i Rossell
f82d27593c Adding imapsync, with the two needed perl packages.
svn path=/nixpkgs/trunk/; revision=15967
2009-06-15 18:37:42 +00:00
Eelco Dolstra
6556756115 * ntp 4.2.4p7.
svn path=/nixpkgs/trunk/; revision=15828
2009-06-02 19:35:26 +00:00
Marc Weber
f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
2009-05-24 10:57:41 +00:00
Eelco Dolstra
7d45b35d1e * OpenSSH 5.2.
svn path=/nixpkgs/trunk/; revision=15689
2009-05-23 16:14:26 +00:00
Lluís Batlle i Rossell
904a4ad868 Adding vtun.
svn path=/nixpkgs/trunk/; revision=15682
2009-05-20 17:51:41 +00:00
Marc Weber
52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Michael Raskin
9eff5ac580 Updating socat
svn path=/nixpkgs/trunk/; revision=15538
2009-05-10 20:10:12 +00:00
Ludovic Courtès
c4d720c3d1 Curl: Propagate Zlib and OpenSSL.
svn path=/nixpkgs/trunk/; revision=15381
2009-04-28 15:41:51 +00:00
Marc Weber
48216ba01a fix openvpn making it find ifonfig
svn path=/nixpkgs/trunk/; revision=15380
2009-04-28 15:37:52 +00:00
Eelco Dolstra
7689a348c4 * Got rid of a lot of "postInstall=postInstall" and similar lines in
builders.  These are redundant now.
* Inlined some trivial builders.
* Removed a few explicit setup-hook creations.  This is done
  automatically now if setupHook is set.
* Deleted the initscripts package.  NixOS doesn't use it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15276
2009-04-23 13:31:10 +00:00
Eelco Dolstra
f762b50991 * Another sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15269
2009-04-23 11:59:43 +00:00
Peter Simons
b7c0e6b66b pdsh: Fix user option "pdsh { rsh = true/false; };".
svn path=/nixpkgs/trunk/; revision=15172
2009-04-20 12:12:56 +00:00
Eelco Dolstra
9c509e2583 * Build wget with support for https.
svn path=/nixpkgs/trunk/; revision=15126
2009-04-18 14:11:35 +00:00
Eelco Dolstra
2eb05cf933 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14965
2009-04-09 12:19:57 +00:00
Marc Weber
0311bb19c8 adding openvpn
svn path=/nixpkgs/trunk/; revision=14901
2009-04-06 13:07:18 +00:00
Eelco Dolstra
d27514cb28 * Sync with the trunk once more.
* Turn on everything in Hydra.

svn path=/nixpkgs/branches/stdenv-updates/; revision=14806
2009-03-31 15:30:47 +00:00
Eelco Dolstra
5a594ea219 * Updated ntp.
svn path=/nixpkgs/trunk/; revision=14798
2009-03-31 09:26:20 +00:00
Peter Simons
33089fcfdd pdsh: updated to version 2.18
svn path=/nixpkgs/trunk/; revision=14731
2009-03-26 19:17:42 +00:00
Eelco Dolstra
d8e436c742 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
2009-03-20 16:49:02 +00:00
Marc Weber
d8f8d0f620 fix tcng
svn path=/nixpkgs/trunk/; revision=14626
2009-03-20 13:12:26 +00:00
Marc Weber
89a634a2a4 adding tcng package
tcc can be used to generate tc traffic shaping commands.
It even can compile kernel modules to classify packages (untested)

svn path=/nixpkgs/trunk/; revision=14574
2009-03-17 14:18:45 +00:00
Marc Weber
8fa77b44cb added iperf (a tool to measure network bandwidth)
svn path=/nixpkgs/trunk/; revision=14564
2009-03-16 18:39:04 +00:00
Eelco Dolstra
3593b97d63 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14557
2009-03-16 12:45:27 +00:00
Ludovic Courtès
d9cfe67b9f lsh: Change the PAM service name in accordance with NixOS (had forgotten to commit it).
svn path=/nixpkgs/trunk/; revision=14542
2009-03-15 14:11:21 +00:00
Eelco Dolstra
d574d882cc * curl 7.19.4.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14507
2009-03-11 15:16:17 +00:00
Eelco Dolstra
fcad0b0a5a * Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310
2009-03-03 13:27:40 +00:00
Armijn Hemel
2d1a047761 add stunnel
svn path=/nixpkgs/trunk/; revision=14301
2009-03-02 15:23:52 +00:00
Lluís Batlle i Rossell
a54392bc53 Adding nylon.
svn path=/nixpkgs/trunk/; revision=14254
2009-02-25 23:21:44 +00:00
Eelco Dolstra
0a11c62147 * Updated cksfv to a version that does compile on GCC 4.3.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14102
2009-02-17 15:45:51 +00:00
Eelco Dolstra
390695e73f * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14057
2009-02-12 21:16:55 +00:00
Lluís Batlle i Rossell
95f38fc409 Fixing the aircrack-ng build, so it doesn't depend on any profile
and points, as usual, only to the store for its dependencies.

svn path=/nixpkgs/trunk/; revision=13965
2009-02-02 21:57:18 +00:00
Eelco Dolstra
37b9b420cb * Sync with trunk. Back to gtkLibs214.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13960
2009-02-02 15:44:04 +00:00
Eelco Dolstra
c696ea1326 * wget 1.11.4.
svn path=/nixpkgs/trunk/; revision=13948
2009-02-02 12:33:40 +00:00
Lluís Batlle i Rossell
2037ddccb0 Adding aircrack-ng.
svn path=/nixpkgs/trunk/; revision=13936
2009-02-01 21:21:12 +00:00
Michael Raskin
cdf5d243a0 Adding ppp and rp-pppoe for different point-to-point connectivity situations. Not tested for trivial reasons, but built OK
svn path=/nixpkgs/trunk/; revision=13925
2009-02-01 13:54:20 +00:00
Ludovic Courtès
6646f2e8e1 GNU Inetutils 1.6.
svn path=/nixpkgs/trunk/; revision=13920
2009-01-30 23:38:02 +00:00
Eelco Dolstra
c91168a600 * Bootstrap tools: build on x86_64-linux.
* Removed Perl from the bootstrap tools.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13827
2009-01-23 15:09:56 +00:00
Eelco Dolstra
581af921ea * Latest OpenSSL, Curl.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13817
2009-01-21 14:11:22 +00:00
Peter Simons
6fb297513a Committing Lluís Batlle's submissions from mailing list posting
<45219fb00901110456i6f21db35tbd1894eaea2146ff@mail.gmail.com>:

 * nixpkgs-ccrypt-1.7-new.patch
 * nixpkgs-cmake-add-ccmake.patch
 * nixpkgs-cpufrequtils-005-new.patch
 * nixpkgs-dwm-5.1-fix.patch
 * nixpkgs-freeimage-3.11.0-new.patch
 * nixpkgs-proxychains-3.1-new.patch
 * nixpkgs-psi-to-0.12.patch
 * nixpkgs-skype-to-2.0.0.72.patch
 * nixpkgs-truecrypt-6.1a-fix.patch
 * nixpkgs-vxl-1.11.0-new.patch
 * nixpkgs-xkb-popular-esperanto-symbols.patch
 * nixpkgs-xorg-via-video-fix.patch

svn path=/nixpkgs/trunk/; revision=13751
2009-01-12 21:12:07 +00:00
Eelco Dolstra
f679021d11 * OpenSSH updated to 5.1p1.
svn path=/nixpkgs/trunk/; revision=13579
2008-12-04 13:16:38 +00:00
Ludovic Courtès
e442925ccd Add Jnettop, a network traffic visualizer.
svn path=/nixpkgs/trunk/; revision=13564
2008-12-03 14:22:55 +00:00
Eelco Dolstra
31d4efb9d7 * Oops.
svn path=/nixpkgs/trunk/; revision=13486
2008-11-28 13:09:07 +00:00