diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-04-11 18:23:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-11 18:23:36 +0200 |
commit | d6f881c82d35e82a006c4c2262f169b6fb88fe2b (patch) | |
tree | f773ec0dd473281ddf07d7c2dceb74b39213ecc0 /pkgs | |
parent | f7a25d979bb27b3822cff10bfa2dff2cad1b19a2 (diff) | |
parent | 6378cdebada6296cd3207ecf18372649881880fc (diff) | |
download | nixpkgs-d6f881c82d35e82a006c4c2262f169b6fb88fe2b.tar nixpkgs-d6f881c82d35e82a006c4c2262f169b6fb88fe2b.tar.gz nixpkgs-d6f881c82d35e82a006c4c2262f169b6fb88fe2b.tar.bz2 nixpkgs-d6f881c82d35e82a006c4c2262f169b6fb88fe2b.tar.lz nixpkgs-d6f881c82d35e82a006c4c2262f169b6fb88fe2b.tar.xz nixpkgs-d6f881c82d35e82a006c4c2262f169b6fb88fe2b.tar.zst nixpkgs-d6f881c82d35e82a006c4c2262f169b6fb88fe2b.zip |
Merge pull request #118647 from bbigras/syncthing
syncthing: 1.14.0 -> 1.15.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/syncthing/add-stcli-target.patch | 17 | ||||
-rw-r--r-- | pkgs/applications/networking/syncthing/default.nix | 17 | ||||
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
4 files changed, 5 insertions, 31 deletions
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 07b5e334b2c..00000000000 --- 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 6d4b3fe34c4..2fa4f0b93c8 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 720d2dcdd9e..c1ec9f9d114 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -729,6 +729,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 288872b5ece..669ef839722 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25886,7 +25886,6 @@ in inherit (callPackages ../applications/networking/syncthing { }) syncthing - syncthing-cli syncthing-discovery syncthing-relay; |