syncthing: 1.14.0 -> 1.15.1

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Bruno Bigras
2021-04-10 14:06:10 -04:00
co-authored by Sandro
parent c86f67bfb9
commit 6378cdebad
4 changed files with 5 additions and 31 deletions
@@ -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"
@@ -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";