diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index b6d318011aa1..4529cf3bd78a 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchgit, go }: stdenv.mkDerivation rec { - version = "0.13.10"; + version = "0.14.0"; name = "syncthing-${version}"; src = fetchgit { url = https://github.com/syncthing/syncthing; rev = "refs/tags/v${version}"; - sha256 = "07q3j6mnrza719rnvbkdsmvlkyr2pch5sj2l204m5iy5mxaghpx7"; + sha256 = "15l3q3r6i3q95i474winswx4y149b5ic7xhpnj52s78fxd4va2q2"; }; buildInputs = [ go ]; diff --git a/pkgs/applications/networking/syncthing013/default.nix b/pkgs/applications/networking/syncthing013/default.nix new file mode 100644 index 000000000000..b6d318011aa1 --- /dev/null +++ b/pkgs/applications/networking/syncthing013/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit, go }: + +stdenv.mkDerivation rec { + version = "0.13.10"; + name = "syncthing-${version}"; + + src = fetchgit { + url = https://github.com/syncthing/syncthing; + rev = "refs/tags/v${version}"; + sha256 = "07q3j6mnrza719rnvbkdsmvlkyr2pch5sj2l204m5iy5mxaghpx7"; + }; + + buildInputs = [ go ]; + + buildPhase = '' + mkdir -p src/github.com/syncthing + ln -s $(pwd) src/github.com/syncthing/syncthing + export GOPATH=$(pwd) + + # 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 + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin + ''; + + meta = { + homepage = https://www.syncthing.net/; + description = "Open Source Continuous File Synchronization"; + license = stdenv.lib.licenses.mpl20; + maintainers = with stdenv.lib.maintainers; [pshendry]; + platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47e02253c7e9..f146cc92dccf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14604,6 +14604,8 @@ in syncthing012 = callPackage ../applications/networking/syncthing012 { }; + syncthing013 = callPackage ../applications/networking/syncthing013 { }; + # linux only by now synergy = callPackage ../applications/misc/synergy { };