From 806af3d2c8ab1969035b38353fdd8902d00b6574 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 14 Aug 2017 20:28:11 +0800 Subject: [PATCH] syncthing: 0.14.32 -> 0.14.36 --- pkgs/applications/networking/syncthing/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 5fb950886e3..dd2576cd083 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }: stdenv.mkDerivation rec { - version = "0.14.32"; + version = "0.14.36"; name = "syncthing-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1agjr3m4gnywbp40idi0pwy25cp836sdcar7r6r9hwcqxyyzz545"; + sha256 = "1l4s74qlabwfkpi9lmm588ym0myavbs06a5gpp9nihzrsal18727"; }; buildInputs = [ go removeReferencesTo ]; @@ -21,13 +21,14 @@ stdenv.mkDerivation rec { # Syncthing's build.go script expects this working directory cd src/github.com/syncthing/syncthing - go run build.go -no-upgrade -version v${version} install all + go run build.go -no-upgrade -version v${version} build ''; installPhase = '' - mkdir -p $out/bin $out/lib/systemd/{system,user} + mkdir -p $out/lib/systemd/{system,user} + + install -Dm755 syncthing $out/bin/syncthing - cp bin/* $out/bin '' + lib.optionalString (stdenv.isLinux) '' substitute etc/linux-systemd/system/syncthing-resume.service \ $out/lib/systemd/system/syncthing-resume.service \