From 6378cdebada6296cd3207ecf18372649881880fc Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Tue, 6 Apr 2021 03:12:19 -0400
Subject: [PATCH] syncthing: 1.14.0 -> 1.15.1

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 .../networking/syncthing/add-stcli-target.patch | 17 -----------------
 .../networking/syncthing/default.nix            | 17 ++++-------------
 pkgs/top-level/aliases.nix                      |  1 +
 pkgs/top-level/all-packages.nix                 |  1 -
 4 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/applications/networking/syncthing/add-stcli-target.patch

diff --git a/pkgs/applications/networking/syncthing/add-stcli-target.patch b/pkgs/applications/networking/syncthing/add-stcli-target.patch
deleted file mode 100644
index 07b5e334b2c9..000000000000
--- a/pkgs/applications/networking/syncthing/add-stcli-target.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/build.go b/build.go
-index c8a5c1cf..d75a8491 100644
---- a/build.go
-+++ b/build.go
-@@ -202,6 +202,12 @@ var targets = map[string]target{
- 			{src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644},
- 		},
- 	},
-+	"stcli": {
-+		name:        "stcli",
-+		description: "Syncthing CLI",
-+		buildPkgs:   []string{"github.com/syncthing/syncthing/cmd/stcli"},
-+		binaryName:  "stcli",
-+	},
- }
- 
- // These are repos we need to clone to run "go generate"
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 6d4b3fe34c42..2fa4f0b93c8e 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,23 +3,20 @@
 let
   common = { stname, target, postInstall ? "" }:
     buildGoModule rec {
-      version = "1.14.0";
-      name = "${stname}-${version}";
+      pname = stname;
+      version = "1.15.1";
 
       src = fetchFromGitHub {
         owner  = "syncthing";
         repo   = "syncthing";
         rev    = "v${version}";
-        sha256 = "1nkjbikin341v74fcwdaa2v5f3zhd8xr6pjhpka1fdw6vvnn4lnd";
+        sha256 = "sha256-d7b1hqW0ZWg74DyW1ZYMT7sIR7H89Ph38XE2Mhh7ySg=";
       };
 
-      vendorSha256 = "1kr6yyigi7bbi4xwpk009q801wvmf3aaw4m40ki0s6gjn0wjl4j3";
+      vendorSha256 = "sha256-00DdGJNCZ94Wj6yvVXJYNJZEiGxYbqTkX6wwon0O1tc=";
 
       doCheck = false;
 
-      patches = [
-        ./add-stcli-target.patch
-      ];
       BUILD_USER="nix";
       BUILD_HOST="nix";
 
@@ -83,12 +80,6 @@ in {
     '';
   };
 
-  syncthing-cli = common {
-    stname = "syncthing-cli";
-
-    target = "stcli";
-  };
-
   syncthing-discovery = common {
     stname = "syncthing-discovery";
     target = "stdiscosrv";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 75fed66865cb..8262c3d03dca 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -728,6 +728,7 @@ mapAliases ({
   sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream";
   swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23
   swtpm-tpm2 = swtpm; # added 2021-02-26
+  syncthing-cli = syncthing; # added 2021-04-06
   system_config_printer = system-config-printer;  # added 2016-01-03
   systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12
   systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d52df074501..50342907ff09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25801,7 +25801,6 @@ in
 
   inherit (callPackages ../applications/networking/syncthing { })
     syncthing
-    syncthing-cli
     syncthing-discovery
     syncthing-relay;