* Sync with the trunk.

svn path=/nixpkgs/branches/x-updates/; revision=25993
This commit is contained in:
Eelco Dolstra
2011-02-16 15:14:04 +00:00
55 changed files with 934 additions and 359 deletions

View File

@@ -1,11 +1,15 @@
{stdenv, fetchurl, libpcap, openssl, zlib, wirelesstools}:
{stdenv, fetchsvn, libpcap, openssl, zlib, wirelesstools}:
stdenv.mkDerivation {
name = "aircrack-ng-1.0-rc2";
let
rev = "1859";
in
stdenv.mkDerivation rec {
name = "aircrack-ng-1.1-${rev}";
src = fetchurl {
url = http://download.aircrack-ng.org/aircrack-ng-1.0-rc2.tar.gz;
sha256 = "9d52f15f3fca52775ecb9cfc1f0aeb04c3c3bd3101665d5760d395f7d2a87d8b";
src = fetchsvn {
url = "http://trac.aircrack-ng.org/svn/trunk";
inherit rev;
sha256 = "6ca98321ef3f14af9c78b2fe25091c4e79e3c28679f240b80f8aeda71b84ab4a";
};
buildInputs = [libpcap openssl zlib];

View File

@@ -1,11 +1,11 @@
{stdenv, fetchurl, readline}:
{stdenv, fetchurl, gnutls, libtasn1, pkgconfig, readline, zlib}:
stdenv.mkDerivation {
name = "lftp-3.5.14";
name = "lftp-4.1.3";
src = fetchurl {
url = ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/lftp-3.5.14.tar.bz2;
sha256 = "0hzrbhpgvndpd4wd08whfv1iqzbcijs1nxz40rhn651xabhiasrv";
url = ftp://ftp.cs.tu-berlin.de/pub/net/ftp/lftp/lftp-4.1.3.tar.bz2;
sha256 = "1nbgbql8kkhdvai0glwgkq8l9ik09l5lb8znpjrv26hfzl15dvv1";
};
buildInputs = [readline];
buildInputs = [gnutls libtasn1 pkgconfig readline zlib];
}