2 files changed, 32 insertions, 2 deletions
diff --git a/pkgs/tools/backup/b2/default.nix b/pkgs/tools/backup/b2/default.nix
new file mode 100644
index 00000000000..15a48b76579
--- /dev/null
+++ b/pkgs/tools/backup/b2/default.nix
@@ -0,0 +1,30 @@
+{ fetchFromGitHub, pythonPackages, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "b2-${version}";
+  version = "git-26.01.2016";
+
+  src = fetchFromGitHub {
+    owner = "Backblaze";
+    repo = "B2_Command_Line_Tool";
+    rev = "b3f06fd53eb1c9a07740b962284753cba413a7b8";
+    sha256 = "0kn2lkh8hp6g8q88glyz03z1r8a47pqm91dc5w083i334swqkjp2";
+  };
+
+  buildInputs = [ pythonPackages.wrapPython ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp b2 $out/bin
+  '';
+
+  postInstall = "wrapPythonPrograms";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Backblaze/B2_Command_Line_Tool;
+    description = "CLI for accessing Backblaze's B2 Cloud Storage";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ hrdinka ];
+  };
+}
diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 556b9651200..ea58ca3f8c1 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -3,14 +3,14 @@
 }:
 
 let
-  version = "0.7.02";
+  version = "0.7.06";
 in
 stdenv.mkDerivation {
   name = "duplicity-${version}";
 
   src = fetchurl {
     url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/duplicity-${version}.tar.gz";
-    sha256 = "0fh3xl4xc7cpi7iam34qd0ndqp1641kfw2609yp40lr78fx65530";
+    sha256 = "133zdi1rbiacvzjys7q3vjm7x84kmr51bsgs037rjhw9vdg5jx80";
   };
 
   installPhase = ''