From 213335ce593b66ad6452fe48bcfe2112b5a5d8c1 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Tue, 3 May 2022 01:29:59 +0000
Subject: [PATCH] diskrsync: unstable-2019-01-02 -> 1.3.0

---
 pkgs/tools/backup/diskrsync/default.nix | 16 ++++-----
 pkgs/tools/backup/diskrsync/deps.nix    | 48 -------------------------
 2 files changed, 8 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/tools/backup/diskrsync/deps.nix

diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix
index 97870d5dedd..4a5c128d168 100644
--- a/pkgs/tools/backup/diskrsync/default.nix
+++ b/pkgs/tools/backup/diskrsync/default.nix
@@ -1,18 +1,19 @@
-{ buildGoPackage, fetchFromGitHub, lib, openssh, makeWrapper }:
+{ buildGoModule, fetchFromGitHub, lib, openssh, makeWrapper }:
 
-buildGoPackage rec {
+buildGoModule rec {
   pname = "diskrsync";
-  version = "unstable-2019-01-02";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "dop251";
     repo = pname;
-    rev = "e8598ef71038527a8a77d1a6cf2a73cfd96d9139";
-    sha256 = "1dqpmc4hp81knhdk3mrmwdr66xiibsvj5lagbm5ciajg9by45mcs";
+    rev = "v${version}";
+    sha256 = "sha256-hM70WD+M3jwze0IG84WTFf1caOUk2s9DQ7pR+KNIt1M=";
   };
 
-  goPackagePath = "github.com/dop251/diskrsync";
-  goDeps = ./deps.nix;
+  vendorSha256 = "sha256-lJaM/sC5/qmmo7Zu7nGR6ZdXa1qw4SuVxawQ+d/m+Aw=";
+
+  ldflags = [ "-s" "-w" ];
 
   nativeBuildInputs = [ makeWrapper ];
 
@@ -26,5 +27,4 @@ buildGoPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [ jluttine ];
   };
-
 }
diff --git a/pkgs/tools/backup/diskrsync/deps.nix b/pkgs/tools/backup/diskrsync/deps.nix
deleted file mode 100644
index 8045737164b..00000000000
--- a/pkgs/tools/backup/diskrsync/deps.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
-[
-  {
-    goPackagePath = "github.com/dop251/spgz";
-    fetch = {
-      type = "git";
-      url = "https://github.com/dop251/spgz";
-      rev = "b86304a2b188";
-      sha256 = "1zss1z523qagk99plb0my8m8ng0danl372iyk1pr4i2skp2bf5z7";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/crypto";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/crypto";
-      rev = "9756ffdc2472";
-      sha256 = "0q7hxaaq6lp0v8qqzifvysl47z5rfdlrxkh3d29vsl3wyby3dxl8";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/net";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/net";
-      rev = "eb5bcb51f2a3";
-      sha256 = "17k4g8krxbl84gzcs275b7gsh66dzm15fdxivjnx9xz8q84l4kby";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/sys";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/sys";
-      rev = "97732733099d";
-      sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw";
-    };
-  }
-  {
-    goPackagePath = "golang.org/x/text";
-    fetch = {
-      type = "git";
-      url = "https://go.googlesource.com/text";
-      rev = "v0.3.0";
-      sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19";
-    };
-  }
-]