diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-16 15:14:04 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-02-16 15:14:04 +0000 |
| commit | 9b6dfe840a2a2e9a209497b1d293ff401bec390a (patch) | |
| tree | c0d61cae3573bef63797a16cef254d5f48f82703 /pkgs/tools | |
| parent | 2e81976a3441967a630d60891cb1fe15f499aab8 (diff) | |
| parent | 7c339958f993831c812b01eacc75d2f769832251 (diff) | |
| download | nixpkgs-9b6dfe840a2a2e9a209497b1d293ff401bec390a.tar nixpkgs-9b6dfe840a2a2e9a209497b1d293ff401bec390a.tar.gz nixpkgs-9b6dfe840a2a2e9a209497b1d293ff401bec390a.tar.bz2 nixpkgs-9b6dfe840a2a2e9a209497b1d293ff401bec390a.tar.lz nixpkgs-9b6dfe840a2a2e9a209497b1d293ff401bec390a.tar.xz nixpkgs-9b6dfe840a2a2e9a209497b1d293ff401bec390a.tar.zst nixpkgs-9b6dfe840a2a2e9a209497b1d293ff401bec390a.zip | |
* Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=25993
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/aircrack-ng/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/tools/networking/lftp/default.nix | 10 |
2 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index a83506efa1c..394022c2d08 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -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]; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index c0e4f61b702..dbef588f370 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -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]; } |