Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

syncthing: 0.13.10 -> 0.14.0 (#17110)

authored by Peter Hoeg and committed by Ioannis Koutras 9b3ff00a 0d5c67db

+42 -2
+2 -2
pkgs/applications/networking/syncthing/default.nix
··· 1 { stdenv, fetchgit, go }: 2 3 stdenv.mkDerivation rec { 4 - version = "0.13.10"; 5 name = "syncthing-${version}"; 6 7 src = fetchgit { 8 url = https://github.com/syncthing/syncthing; 9 rev = "refs/tags/v${version}"; 10 - sha256 = "07q3j6mnrza719rnvbkdsmvlkyr2pch5sj2l204m5iy5mxaghpx7"; 11 }; 12 13 buildInputs = [ go ];
··· 1 { stdenv, fetchgit, go }: 2 3 stdenv.mkDerivation rec { 4 + version = "0.14.0"; 5 name = "syncthing-${version}"; 6 7 src = fetchgit { 8 url = https://github.com/syncthing/syncthing; 9 rev = "refs/tags/v${version}"; 10 + sha256 = "15l3q3r6i3q95i474winswx4y149b5ic7xhpnj52s78fxd4va2q2"; 11 }; 12 13 buildInputs = [ go ];
+38
pkgs/applications/networking/syncthing013/default.nix
···
··· 1 + { stdenv, fetchgit, go }: 2 + 3 + stdenv.mkDerivation rec { 4 + version = "0.13.10"; 5 + name = "syncthing-${version}"; 6 + 7 + src = fetchgit { 8 + url = https://github.com/syncthing/syncthing; 9 + rev = "refs/tags/v${version}"; 10 + sha256 = "07q3j6mnrza719rnvbkdsmvlkyr2pch5sj2l204m5iy5mxaghpx7"; 11 + }; 12 + 13 + buildInputs = [ go ]; 14 + 15 + buildPhase = '' 16 + mkdir -p src/github.com/syncthing 17 + ln -s $(pwd) src/github.com/syncthing/syncthing 18 + export GOPATH=$(pwd) 19 + 20 + # Syncthing's build.go script expects this working directory 21 + cd src/github.com/syncthing/syncthing 22 + 23 + go run build.go -no-upgrade -version v${version} install all 24 + ''; 25 + 26 + installPhase = '' 27 + mkdir -p $out/bin 28 + cp bin/* $out/bin 29 + ''; 30 + 31 + meta = { 32 + homepage = https://www.syncthing.net/; 33 + description = "Open Source Continuous File Synchronization"; 34 + license = stdenv.lib.licenses.mpl20; 35 + maintainers = with stdenv.lib.maintainers; [pshendry]; 36 + platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; 37 + }; 38 + }
+2
pkgs/top-level/all-packages.nix
··· 13870 13871 syncthing012 = go15Packages.syncthing012.bin // { outputs = [ "bin" ]; }; 13872 13873 # linux only by now 13874 synergy = callPackage ../applications/misc/synergy { }; 13875
··· 13870 13871 syncthing012 = go15Packages.syncthing012.bin // { outputs = [ "bin" ]; }; 13872 13873 + syncthing013 = callPackage ../applications/networking/syncthing013 { }; 13874 + 13875 # linux only by now 13876 synergy = callPackage ../applications/misc/synergy { }; 13877