Merge branch 'master' into x-updates

Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).

3 files changed, 63 insertions, 5 deletions

diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix
new file mode 100644
index 000000000000..a8dd26ab6095
--- /dev/null
+++ b/pkgs/applications/misc/audio/soxr/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "soxr-0.1.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/soxr/${name}-Source.tar.xz";
+    sha256 = "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw";
+  };
+
+  preConfigure = ''export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src'';
+
+  buildInputs = [ cmake ];
+
+  meta = {
+    description = "An audio resampling library";
+    homepage = http://soxr.sourceforge.net;
+    license = "LGPLv2.1+";
+  };
+}
diff --git a/pkgs/applications/misc/vanitygen/default.nix b/pkgs/applications/misc/vanitygen/default.nix
new file mode 100644
index 000000000000..1aa3f57ecca3
--- /dev/null
+++ b/pkgs/applications/misc/vanitygen/default.nix
@@ -0,0 +1,38 @@
+{ fetchurl, stdenv, openssl, pcre }:
+
+stdenv.mkDerivation rec {
+  version = "0.21";
+  name = "vanitygen-${version}";
+
+  src = fetchurl {
+    name = "vanitygen-${version}.tar.gz";
+    url = "https://github.com/samr7/vanitygen/tarball/0.21";
+    sha256 = "1lj0gi08lg0pcby5pbpi08ysynzy24qa1n1065112shkpasi0kxv";
+  };
+
+  buildInputs = [ openssl pcre ];
+
+  installPhase = ''
+    ensureDir $out/bin
+    cp vanitygen $out/bin
+    cp keyconv $out/bin/vanitygen-keyconv
+  '';
+
+  meta = {
+      description = "Bitcoin vanity address generator";
+      longDescription= ''
+        Vanitygen can search for exact prefixes or regular expression
+        matches, so you can generate Bitcoin addresses that starts
+        with the needed mnemonic.
+
+        Vanitygen can generate regular bitcoin addresses, namecoin
+        addresses, and testnet addresses.
+
+        When searching for exact prefixes, vanitygen will ensure that
+        the prefix is possible, will provide a difficulty estimate,
+        and will run about 30% faster.
+      '';
+      homepage = "https://github.com/samr7/vanitygen";
+      license = "AGPLv3";
+  };
+}
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index bdc5c7856aa1..db2b9eb94e38 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,15 +1,15 @@
-{ cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String
-, wirelesstools, X11, X11Xft
+{ cabal, filepath, libXrandr, mtl, parsec, regexCompat, stm, time
+, utf8String, wirelesstools, X11, X11Xft
 }:
 
 cabal.mkDerivation (self: {
   pname = "xmobar";
-  version = "0.17";
-  sha256 = "0ahb3xqxcfvpgxyb901bpl4i56mnslzwplcqxrr13glngcl7d25s";
+  version = "0.18";
+  sha256 = "08kk0yjx51vjrvvvd34hv8v80dsh8kjv150qf413ikaff0i28v7w";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
-    filepath mtl parsec stm time utf8String X11 X11Xft
+    filepath mtl parsec regexCompat stm time utf8String X11 X11Xft
   ];
   extraLibraries = [ libXrandr wirelesstools ];
   configureFlags = "-fwith_xft -fwith_iwlib";