Merge branch 'master' into stdenv-updates.

Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix

1 files changed, 18 insertions, 0 deletions

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
new file mode 100644
index 000000000000..bcf03356c683
--- /dev/null
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, openssl, zlib, e2fsprogs }:
+
+stdenv.mkDerivation {
+  name = "tarsnap-1.0.33";
+
+  src = fetchurl {
+    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.33.tgz";
+    sha256 = "0z8bmra3xms9vcgvkiy9fy1j97192z6w7n658j6zr5cniid8438c";
+  };
+
+  buildInputs = [ openssl zlib e2fsprogs ];
+
+  meta = {
+    description = "Online backups for the truly paranoid";
+    homepage = "http://www.tarsnap.com/";
+    maintainers = with stdenv.lib.maintainers; [roconnor];
+  };
+}