From 9a5b545e86fe826da481e93b6792012501ceefb4 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 31 Dec 2017 10:52:30 +0200
Subject: [PATCH 1/2] diskrsync: init at unstable-2017-09-27

---
 pkgs/tools/backup/diskrsync/default.nix | 27 +++++++++++++++++++++++++
 pkgs/tools/backup/diskrsync/deps.nix    | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 3 files changed, 50 insertions(+)
 create mode 100644 pkgs/tools/backup/diskrsync/default.nix
 create mode 100644 pkgs/tools/backup/diskrsync/deps.nix

diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix
new file mode 100644
index 00000000000..b223124dd14
--- /dev/null
+++ b/pkgs/tools/backup/diskrsync/default.nix
@@ -0,0 +1,27 @@
+{ buildGoPackage, fetchFromGitHub, stdenv }:
+
+buildGoPackage rec {
+
+  name = "${pname}-${version}";
+  pname = "diskrsync";
+  version = "unstable-2017-09-27";
+
+  src = fetchFromGitHub {
+    owner = "dop251";
+    repo = pname;
+    rev = "45818879a98edceaa915739c1b8ece58e4b34866";
+    sha256 = "0jvx5manh1z0shvg616vw0n5cp5v4bljk6h3mmw3bdskg9r076lh";
+  };
+
+  goPackagePath = "github.com/dop251/diskrsync";
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Rsync for block devices and disk images";
+    homepage = https://github.com/dop251/diskrsync;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ jluttine ];
+  };
+
+}
diff --git a/pkgs/tools/backup/diskrsync/deps.nix b/pkgs/tools/backup/diskrsync/deps.nix
new file mode 100644
index 00000000000..65b64f0777a
--- /dev/null
+++ b/pkgs/tools/backup/diskrsync/deps.nix
@@ -0,0 +1,21 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/dop251/spgz";
+    fetch = {
+      type = "git";
+      url = "https://github.com/dop251/spgz";
+      rev = "ca4328964eba8a1863356b3d927d4f6a10c966b5";
+      sha256 = "06m48hfgyj30704my205chw42xkpwfm6lv0jvhgqkkhhhs9sly62";
+    };
+  }
+  {
+    goPackagePath = "golang.org/x/crypto";
+    fetch = {
+      type = "git";
+      url = "https://go.googlesource.com/crypto";
+      rev = "95a4943f35d008beabde8c11e5075a1b714e6419";
+      sha256 = "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c77658244df..8ec0d31586a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1769,6 +1769,8 @@ with pkgs;
 
   dev86 = callPackage ../development/compilers/dev86 { };
 
+  diskrsync = callPackage ../tools/backup/diskrsync { };
+
   djbdns = callPackage ../tools/networking/djbdns { };
 
   dnscrypt-proxy = callPackage ../tools/networking/dnscrypt-proxy { };

From 07edef3dd30cd1d055bea5c8cd7c2f0c91997de3 Mon Sep 17 00:00:00 2001
From: Jaakko Luttinen <jaakko.luttinen@iki.fi>
Date: Sun, 4 Feb 2018 12:03:01 +0200
Subject: [PATCH 2/2] diskrsync: unstable-2017-09-27 -> unstable-2018-02-03

---
 pkgs/tools/backup/diskrsync/default.nix | 6 +++---
 pkgs/tools/backup/diskrsync/deps.nix    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix
index b223124dd14..b04a1dab40f 100644
--- a/pkgs/tools/backup/diskrsync/default.nix
+++ b/pkgs/tools/backup/diskrsync/default.nix
@@ -4,13 +4,13 @@ buildGoPackage rec {
 
   name = "${pname}-${version}";
   pname = "diskrsync";
-  version = "unstable-2017-09-27";
+  version = "unstable-2018-02-03";
 
   src = fetchFromGitHub {
     owner = "dop251";
     repo = pname;
-    rev = "45818879a98edceaa915739c1b8ece58e4b34866";
-    sha256 = "0jvx5manh1z0shvg616vw0n5cp5v4bljk6h3mmw3bdskg9r076lh";
+    rev = "2f36bd6e5084ce16c12a2ee216ebb2939a7d5730";
+    sha256 = "1rpfk7ds4lpff30aq4d8rw7g9j4bl2hd1bvcwd1pfxalp222zkxn";
   };
 
   goPackagePath = "github.com/dop251/diskrsync";
diff --git a/pkgs/tools/backup/diskrsync/deps.nix b/pkgs/tools/backup/diskrsync/deps.nix
index 65b64f0777a..684100968e8 100644
--- a/pkgs/tools/backup/diskrsync/deps.nix
+++ b/pkgs/tools/backup/diskrsync/deps.nix
@@ -5,8 +5,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/dop251/spgz";
-      rev = "ca4328964eba8a1863356b3d927d4f6a10c966b5";
-      sha256 = "06m48hfgyj30704my205chw42xkpwfm6lv0jvhgqkkhhhs9sly62";
+      rev = "d50e5e978e08044da0cf9babc6b42b55ec8fe0d5";
+      sha256 = "11h8z6cwxw272rn5zc4y3w9d6py113iaimy681v6xxv26d30m8bx";
     };
   }
   {
@@ -14,8 +14,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/crypto";
-      rev = "95a4943f35d008beabde8c11e5075a1b714e6419";
-      sha256 = "0bkm0jx9mxmi1liabb9c04kf765n7d0062zdp3zmvzyamsq00lcx";
+      rev = "1875d0a70c90e57f11972aefd42276df65e895b9";
+      sha256 = "1kprrdzr4i4biqn7r9gfxzsmijya06i9838skprvincdb1pm0q2q";
     };
   }
 ]