Commit Graph

823 Commits

Author SHA1 Message Date
Eelco Dolstra
2322899a1f openssh: Update to 6.1p1 2012-09-18 17:01:08 -04:00
Rickard Nilsson
7c43b041d9 Add nss-pam-ldapd version 0.8.10
nss-pam-ldapd is a fork of nss_ldap that uses a daemon (nslcd) to
connect to the LDAP server, instead of going directly from PAM/NSS.
This improves performance and separation, and increases security
if you connect to LDAP with a password, since only the nscd daemon
needs to know the password, not every user of PAM/NSS.

This commit will be followed by a commit to NixOS which enables the
use of the nslcd daemon.
2012-09-14 00:06:25 +02:00
Eelco Dolstra
fcb1d64322 curl: Update to 7.27.0 2012-09-13 11:36:34 -04:00
Mathijs Kwik
c1c9c9d2a1 network-manager: use libnl3, as libnl1 is no longer maintained 2012-09-09 13:04:13 +02:00
Lluís Batlle i Rossell
fcfa8908ca miniupnpc: update to 1.7. 2012-09-01 00:10:43 +02:00
Rickard Nilsson
abf6366f87 Add surfraw 2.2.8 2012-08-31 10:55:23 +02:00
Yury G. Kudryashov
448b7cce53 Merge branch 'fix-NM-pptp' 2012-08-26 22:09:56 +04:00
Lluís Batlle i Rossell
2ecb9fdb58 aircrackng, kismet: update them to latest trunk and release respectively 2012-08-11 14:42:35 +02:00
Yury G. Kudryashov
8040b72293 KDE NM 0.9.0.4 2012-08-08 12:55:00 +04:00
Yury G. Kudryashov
8071b4040e pptp: Fix path to ip
routing.c has hardcoded /bin/ip. Use ${iproute2}/sbin/ip instead.
2012-08-08 12:54:10 +04:00
Yury G. Kudryashov
64f932f8fd NetworkManager-pptp: fix path to pppd and pptp, upgrade 2012-08-02 23:44:50 +04:00
Rickard Nilsson
70114d1b0d networkmanagerapplet: Update to 0.9.4.1
Also add dependency on mobile_broadband_provider_info.
2012-08-01 11:51:41 +02:00
Rickard Nilsson
b530c8c22f networkmanager: Add me as maintainer 2012-08-01 11:49:56 +02:00
Rickard Nilsson
cae8bec490 stunnel: Update to 4.53 2012-07-31 00:11:03 +02:00
Eelco Dolstra
4e7df1423f dhcp: Update to 4.1-ESV-R6
Fixes several security problems.
2012-07-26 11:44:34 -04:00
Eelco Dolstra
d3fb3157d1 autossh: Fix indentation and add to the channel 2012-07-25 23:18:39 -04:00
Peter Simons
519248fdbb Merge pull request #56 from aszlig/netrw
Add package netrw
2012-07-23 11:21:06 -07:00
Peter Simons
2c867c6c04 nbd: update to version 3.2 2012-07-22 18:56:21 +02:00
aszlig
172f29cc3c netrw: Add missing license to meta attributes. 2012-07-21 13:39:55 +02:00
aszlig
8bd81bc3d6 netrw: Allow to specify checksum hash library.
Within netrw the only checksum algorithm that is available is MD5. We thus make
it possible for users to override this, so algorithms from other libraries such
as OpenSSL and MHash can used.
2012-07-20 01:49:47 +02:00
aszlig
8ded076ac0 Add new package netrw, version 1.3.2.
The upstream URL unfortunately wasn't available at this time, so I provided an
alternate mirror. I checksummed the file against the hashes from various
distributions in order to make sure it's the right one.
2012-07-20 01:45:49 +02:00
Shea Levy
4497344e49 Merge branch 'master' into x-updates 2012-07-18 23:24:10 -04:00
Rob Vermaas
09f6874aad Add trickle 1.07 2012-07-16 12:06:31 +02:00
Shea Levy
c514ee974a Merge remote-tracking branch 'upstream/master' into x-updates
mountall conflict was trivial

Conflicts:
	pkgs/os-specific/linux/mountall/default.nix
2012-07-14 14:24:27 -04:00
Rickard Nilsson
a126bf9ae4 networkmanager: Update to 0.9.4.0 2012-07-13 01:53:07 +02:00
Ludovic Courtès
71ffa0ce4e Seeks 0.4.1. 2012-07-05 00:52:36 +02:00
Michael Fox
063a627493 Curl. Uprev to 2.26.0
Solves a hideous bug which affects lots of things including nix-env.
The question now is, how to rebuild everything that depends directly or indirectly on curl?

More about the underlying bug and its resolution here:
    http://comments.gmane.org/gmane.comp.web.curl.library/33285

Bug looks like this:

    curl google.com
    curl: (7) Failed to connect to 74.125.224.35: Invalid argument
2012-06-29 21:15:35 -07:00
Rob Vermaas
6dc45870af * Add MiniDLNA 1.0.24, media server 2012-06-24 20:24:58 +02:00
Eelco Dolstra
7925441bab net-snmp: Moved to pkgs/servers/monitoring 2012-06-21 15:22:17 -04:00
Peter Simons
3c57d2b40e rtorrent: updated to version 0.9.2
svn path=/nixpkgs/trunk/; revision=34526
2012-06-16 14:15:46 +00:00
Peter Simons
ba3c1f4a93 libtorrent: updated to version 0.13.2
svn path=/nixpkgs/trunk/; revision=34525
2012-06-16 14:15:42 +00:00
Eelco Dolstra
c9f95fa0c2 * net-snmp: enable Perl support.
svn path=/nixpkgs/trunk/; revision=34424
2012-06-10 17:06:35 +00:00
Eelco Dolstra
192291eb01 * Added net-snmp.
svn path=/nixpkgs/trunk/; revision=34413
2012-06-09 23:28:07 +00:00
Peter Simons
8a4cc0bc12 nbd: updated to version 3.1.1
svn path=/nixpkgs/trunk/; revision=34257
2012-05-28 10:57:45 +00:00
Evgeny Egorochkin
62b353e605 proxychains: add revision and hash
svn path=/nixpkgs/trunk/; revision=34253
2012-05-27 12:37:59 +00:00
Evgeny Egorochkin
46809b6094 ProxyChains: version bump
svn path=/nixpkgs/trunk/; revision=34252
2012-05-27 11:28:19 +00:00
Eelco Dolstra
41840af689 * Add a setup hook ‘autoreconfHook’ to simplify packages that need to
run autoreconf:

    buildInputs = [ autoreconfHook ];

  is essentially equivalent to

    buildInputs = [ autoconf automake libtool ];
    preConfigure = "autoreconf -i";

svn path=/nixpkgs/branches/x-updates/; revision=34181
2012-05-19 02:52:36 +00:00
Rob Vermaas
1e7dc29a98 add haproxy
svn path=/nixpkgs/trunk/; revision=34165
2012-05-18 07:50:10 +00:00
Rickard Nilsson
ec996106ec tftp-hpa 5.2.
svn path=/nixpkgs/trunk/; revision=34108
2012-05-15 14:25:14 +00:00
Eelco Dolstra
5749281c0c * nzbget updated to 0.8.0.
svn path=/nixpkgs/trunk/; revision=34077
2012-05-12 23:11:18 +00:00
Eelco Dolstra
69c66055b7 * OpenSSH 6.0.
svn path=/nixpkgs/trunk/; revision=33988
2012-05-05 14:42:17 +00:00
Rob Vermaas
506c2ee455 Update offlineimap to 6.5.3. Patch by garbas.
svn path=/nixpkgs/trunk/; revision=33948
2012-04-30 12:47:30 +00:00
Lluís Batlle i Rossell
2eb8304fcf Adding ntop. It runs for me, if using "-P directory".
svn path=/nixpkgs/trunk/; revision=33870
2012-04-21 15:04:46 +00:00
Lluís Batlle i Rossell
682690bd71 Adding mosh.
svn path=/nixpkgs/trunk/; revision=33804
2012-04-16 21:44:12 +00:00
Eelco Dolstra
e7dcb5c31f * dhcpcd updated to 5.5.6.
svn path=/nixpkgs/trunk/; revision=33719
2012-04-10 12:56:00 +00:00
Ludovic Courtès
6caf0820f9 lsh: Assume UNIX98 PTYs are available.
svn path=/nixpkgs/trunk/; revision=33627
2012-04-05 16:26:44 +00:00
Yury G. Kudryashov
68b6d23a35 Fix altermime build
svn path=/nixpkgs/trunk/; revision=33625
2012-04-05 15:31:10 +00:00
Eelco Dolstra
b9bdfccec9 * dhcpcd updated to 5.5.5.
svn path=/nixpkgs/trunk/; revision=33564
2012-04-04 14:07:57 +00:00
Russell O'Connor
2c99cdce3e Adding examples to share directory
The easy-rsa example contains scripts for generating certificates.

svn path=/nixpkgs/trunk/; revision=33550
2012-04-02 22:05:02 +00:00
Russell O'Connor
d8e8730127 Adding support for dhcpcd to wicd.
svn path=/nixpkgs/trunk/; revision=33532
2012-04-01 22:46:15 +00:00
Michael Raskin
d388527f21 Update ripmime; builds now
svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33484
2012-03-30 05:30:09 +00:00
Peter Simons
31507bc274 nbd: don't try to link -lrt and -lpthread on non-Linux platforms
svn path=/nixpkgs/trunk/; revision=33412
2012-03-25 19:40:04 +00:00
Peter Simons
41081c4eb0 nbd: re-introduced linking with -lrt, and added an additional -lpthread on top of it
Linking these libraries makes sure that they can be found at run-time,
because a proper rpath into the Nix store is added to the generated
executable. Without that rpath, nbd-server will try to load the system's
libpthread.so.0, which may not be what we want.

svn path=/nixpkgs/trunk/; revision=33408
2012-03-25 18:10:30 +00:00
Eelco Dolstra
c977a57394 * Add dhcpcd to the channel.
svn path=/nixpkgs/trunk/; revision=33334
2012-03-21 16:48:36 +00:00
Lluís Batlle i Rossell
5521faad65 Updating socat. I thought it could have improvements in performance for nixos
build-vm in my computer, but does not.


svn path=/nixpkgs/trunk/; revision=33239
2012-03-18 18:33:10 +00:00
Lluís Batlle i Rossell
446b01489a Updating tcpdump and libpcap. I also remove a patch of libpcap I don't know
what's for. It builds and runs equally for me with or without it. I couldn't
find notes in svn log about it.


svn path=/nixpkgs/trunk/; revision=32996
2012-03-11 19:37:49 +00:00
Florian Friesdorf
36fbb68247 fix typo maitainers -> maintainers
svn path=/nixpkgs/trunk/; revision=32992
2012-03-11 15:20:12 +00:00
Yury G. Kudryashov
7c4a72dd77 NM-pptp: 0.9.2.0, optional GNOME support
svn path=/nixpkgs/trunk/; revision=32986
2012-03-11 14:07:37 +00:00
Yury G. Kudryashov
d7e089e820 Add myself to etworkmanager.meta.maintainers
svn path=/nixpkgs/trunk/; revision=32985
2012-03-11 14:07:34 +00:00
Yury G. Kudryashov
1fef26d8f7 NM purity patch: substitute before build, fix typos
svn path=/nixpkgs/trunk/; revision=32978
2012-03-10 23:13:32 +00:00
Yury G. Kudryashov
93683bf273 networkmanagement-0.9.0
svn path=/nixpkgs/trunk/; revision=32964
2012-03-09 19:34:10 +00:00
Yury G. Kudryashov
b94c51c2f7 gnome-keyring -> libgnome-keyring
svn path=/nixpkgs/trunk/; revision=32906
2012-03-08 16:49:14 +00:00
Lluís Batlle i Rossell
b2653605c4 Setting myself as maintainer of netkit tftp, to get updates if it fails to build.
svn path=/nixpkgs/trunk/; revision=32869
2012-03-07 22:21:24 +00:00
Lluís Batlle i Rossell
ce482ec155 Adding a new url for netkit tftp, as the other is down.
svn path=/nixpkgs/trunk/; revision=32855
2012-03-07 18:13:03 +00:00
Lluís Batlle i Rossell
1981a57c13 Updating inadyn. The old sourceforge place did not work anymore.
svn path=/nixpkgs/trunk/; revision=32845
2012-03-07 08:37:07 +00:00
Eelco Dolstra
11d1104a88 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32731
2012-03-01 22:22:24 +00:00
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Peter Simons
57b612cb05 vpnc: added patch to fix the 'Error: either "to" is duplicate, or "ipid" is a garbage' bug
Further details are at:

  http://www.rz.uni-konstanz.de/activekb/questions/250/VPNC+unter+Ubuntu+11.10+%22Error%3A+either+%22to%22+is+duplicate%2C+or+%22ipid%22+is+a+garbage.%22

svn path=/nixpkgs/trunk/; revision=32712
2012-02-29 22:50:33 +00:00
Evgeny Egorochkin
0def4140f6 network-manager-applet: version bump
svn path=/nixpkgs/trunk/; revision=32693
2012-02-29 13:30:04 +00:00
Evgeny Egorochkin
cff68ececb network-manager: version bump
svn path=/nixpkgs/trunk/; revision=32691
2012-02-29 13:29:59 +00:00
Florian Friesdorf
ee15dc2327 Revert "fix bittorrent by using buildPythonPackage"
This reverts commit c029f9f7fe86867cfd94461996dc6a6415e0e8d0.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32639
2012-02-28 00:06:36 +00:00
Florian Friesdorf
2eb54f5062 fix bittorrent by using buildPythonPackage
svn path=/nixpkgs/branches/stdenv-updates/; revision=32636
2012-02-27 22:53:44 +00:00
Shea Levy
ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Peter Simons
4716f6735d vpnc: install the README file into $out/share/doc
svn path=/nixpkgs/trunk/; revision=32544
2012-02-24 17:32:11 +00:00
Yury G. Kudryashov
38e3d7bc86 svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Peter Simons
4b8cceb571 wicd: emit ip-up and ip-down as well
svn path=/nixpkgs/trunk/; revision=32482
2012-02-22 20:29:15 +00:00
Eelco Dolstra
f71dd91a43 * Apply r32435 from the trunk (always build Python with SSL support).
Remove .ssl references from some packages missed in that commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
2012-02-21 23:35:35 +00:00
Eelco Dolstra
e64443baf1 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
Peter Simons
da2159548a nbd: avoid use of "install -D", which doesn't seem to work on FreeBSD
svn path=/nixpkgs/trunk/; revision=32459
2012-02-21 15:07:39 +00:00
Peter Simons
4e76d21c84 nbd: updated to version 3.0
svn path=/nixpkgs/trunk/; revision=32450
2012-02-21 10:58:15 +00:00
Eelco Dolstra
45fed14272 * Revert r32435. We'll be doing a stdenv merge in a few days, so
let's put it in there rather than having the Nth near-complete
  rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436
2012-02-20 18:59:43 +00:00
Peter Simons
95cbf4ed55 Modified the Python 2.7 expression so that the interpreter has unconditional
OpenSSL support. Having OpenSSL available at the time the core interpreter is
built enables all kinds of important crypto features (i.e. additional hashlib
algorithms, etc.) that otherwise won't be available.

svn path=/nixpkgs/trunk/; revision=32435
2012-02-20 18:52:52 +00:00
Eelco Dolstra
fd41f11208 * dhcpcd: get the entry/exit hooks from /etc.
svn path=/nixpkgs/trunk/; revision=32429
2012-02-20 15:12:34 +00:00
Yury G. Kudryashov
d8454e538c svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32417
2012-02-20 05:30:06 +00:00
Eelco Dolstra
ebe141d306 * Updated dhcpcd to 5.5.4.
svn path=/nixpkgs/trunk/; revision=32412
2012-02-20 01:14:57 +00:00
Yury G. Kudryashov
313a029f16 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Yury G. Kudryashov
615f0423e8 telnet.meta.platforms
svn path=/nixpkgs/trunk/; revision=32355
2012-02-17 16:22:07 +00:00
Yury G. Kudryashov
79d0d410cb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32350
2012-02-17 13:43:31 +00:00
Eelco Dolstra
148612239c * Added openresolv, a program for managing /etc/resolv.conf.
svn path=/nixpkgs/trunk/; revision=32337
2012-02-16 18:40:05 +00:00
Eelco Dolstra
9da1dd6c90 * dnsmasq updated to 2.59.
svn path=/nixpkgs/trunk/; revision=32334
2012-02-16 18:03:12 +00:00
Yury G. Kudryashov
e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Yury G. Kudryashov
82aab32119 Remove knetworkmanager. Use networkmanagement instead
svn path=/nixpkgs/trunk/; revision=32329
2012-02-16 14:54:13 +00:00
Yury G. Kudryashov
a03eacdf22 kde4.networkmanagement needs pkg-config
svn path=/nixpkgs/trunk/; revision=32328
2012-02-16 14:53:51 +00:00
Shea Levy
dfda68af54 Fix tarball
I don't know what nbd is, I just followed the complaints in the log

svn path=/nixpkgs/trunk/; revision=32310
2012-02-16 02:21:17 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Peter Simons
85f4a69a14 nbd: the test suite still doesn't work on Hydra
svn path=/nixpkgs/trunk/; revision=32132
2012-02-07 21:45:05 +00:00
Peter Simons
07a925d08a nbd: re-enable the test suite to see what happens
svn path=/nixpkgs/trunk/; revision=32127
2012-02-07 19:54:31 +00:00
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