Merge branch 'master' into x-updates

pkgs/tools/backup/bup/default.nix

@@ -52,5 +52,8 @@ stdenv.mkDerivation {
       Highly efficient file backup system based on the git packfile format.
       Capable of doing *fast* incremental backups of virtual machine images.
     '';
+
+    maintainers = [ stdenv.lib.maintainers.simons ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/networking/dhcpcd/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dhcpcd-5.6.7";
+  name = "dhcpcd-5.6.8";
 
   src = fetchurl {
     url = "http://roy.marples.name/downloads/dhcpcd/${name}.tar.bz2";
-    sha256 = "144cjcjnr85jiwbw5iv3hvn97sc0z25ya3r31cn0wv11jrsw6b0h";
+    sha256 = "1i7fv1l0n7q1mnia7g0789ch63x5zhwk5gsrwvs78dv2f2kmvcd3";
   };
 
   configureFlags = "--sysconfdir=/etc";

pkgs/tools/networking/p2p/tahoe-lafs/default.nix

@@ -8,15 +8,15 @@
 # some loss of functionality because of it.
 
 let
-  name = "tahoe-lafs-1.8.3";
+  name = "tahoe-lafs-1.9.2";
 in
 buildPythonPackage {
   inherit name;
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.8.3.tar.bz2";
-    sha256 = "00pm7fvwci5ncg2jhsqsl9r79kn495yni8nmr7p5i98f3siwvjd8";
+    url = "http://tahoe-lafs.org/source/tahoe-lafs/snapshots/allmydata-tahoe-1.9.2.tar.bz2";
+    sha256 = "0111gmavyrnglx10kj8z7wm7y97fyg9isv71c0gx9kq4c03knxq4";
   };
 
   # The patch doesn't apply cleanly to the current version.
@@ -37,7 +37,7 @@ buildPythonPackage {
         -es"|cmd = find_exe.find_exe('twistd')|cmd = ['${twisted}/bin/twistd']|g"
 
     sed -i "src/allmydata/util/iputil.py" \
-        -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/sbin/ifconfig'|g"
+        -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/bin/ifconfig'|g"
 
     # Chroots don't have /etc/hosts and /etc/resolv.conf, so work around
     # that.

pkgs/tools/networking/reaver-wps/default.nix

@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, libpcap, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "reaver-wps-1.4";
+
+  src = fetchurl {
+    url = http://reaver-wps.googlecode.com/files/reaver-1.4.tar.gz;
+    sha256 = "0bdjai4p8xbsw8zdkkk43rgsif79x0nyx4djpyv0mzh59850blxd";
+  };
+
+  buildInputs = [ libpcap sqlite ];
+
+  prePatch = ''
+    cd src
+  '';
+
+  preInstall = ''
+    ensureDir $out/bin
+  '';
+
+  meta = {
+    description = "Brute force attack against Wifi Protected Setup";
+    homepage = http://code.google.com/p/reaver-wps;
+    license = "GPLv2+";
+  };
+}

pkgs/tools/package-management/nix/unstable.nix

@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.5.2pre3082_2398417";
+  name = "nix-1.5.2pre3091_772b709";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/4480483/download/5/${name}.tar.xz";
-    sha256 = "efea03fd9e15f52564ecfe6942bf9e8a757ef2e83b6ad9832f214342b2cbba83";
+    url = "http://hydra.nixos.org/build/4796316/download/5/${name}.tar.xz";
+    sha256 = "f1acf131842d9604d886d5f98aaa4739bea63536023d7287ce48613c38d49fbd";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];