syncthing: 0.14.32 -> 0.14.36

This commit is contained in:
Peter Hoeg 2017-08-14 20:28:11 +08:00
parent 3c136e5fa4
commit 806af3d2c8

View File

@ -1,14 +1,14 @@
{ stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }: { stdenv, lib, fetchFromGitHub, go, procps, removeReferencesTo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.14.32"; version = "0.14.36";
name = "syncthing-${version}"; name = "syncthing-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "syncthing"; owner = "syncthing";
repo = "syncthing"; repo = "syncthing";
rev = "v${version}"; rev = "v${version}";
sha256 = "1agjr3m4gnywbp40idi0pwy25cp836sdcar7r6r9hwcqxyyzz545"; sha256 = "1l4s74qlabwfkpi9lmm588ym0myavbs06a5gpp9nihzrsal18727";
}; };
buildInputs = [ go removeReferencesTo ]; buildInputs = [ go removeReferencesTo ];
@ -21,13 +21,14 @@ stdenv.mkDerivation rec {
# Syncthing's build.go script expects this working directory # Syncthing's build.go script expects this working directory
cd src/github.com/syncthing/syncthing 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 = '' 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) '' '' + lib.optionalString (stdenv.isLinux) ''
substitute etc/linux-systemd/system/syncthing-resume.service \ substitute etc/linux-systemd/system/syncthing-resume.service \
$out/lib/systemd/system/syncthing-resume.service \ $out/lib/systemd/system/syncthing-resume.service \