Revert "syncthing: 0.14.17 -> 0.14.23 (#22553)"

joachifm · joachifm · commit 9b8c2c7535a1 · 2017-02-13T23:51:03.000+01:00
This reverts commit 9cf004b. See 9cf004b#commitcomment-20864154
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
@@ -1,19 +1,14 @@
-{ stdenv, lib, fetchFromGitHub, go, pkgs }:
+{ stdenv, fetchFromGitHub, go }:
 
-let
-  removeExpr = ref: ''
-    sed -i "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \
-  '';
-
-in stdenv.mkDerivation rec {
-  version = "0.14.23";
+stdenv.mkDerivation rec {
+  version = "0.14.17";
   name = "syncthing-${version}";
 
   src = fetchFromGitHub {
     owner  = "syncthing";
     repo   = "syncthing";
     rev    = "v${version}";
-    sha256 = "1himf8yhfpjsv5m068y2f6f696d7ip0jq7jmg69kn7035zlxicis";
+    sha256 = "0l220jnm8xwfc5jrznan15290al05bim5yyy4wngj9c55av6mlzq";
   };
 
   buildInputs = [ go ];
@@ -30,32 +25,15 @@ in stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir -p $out/bin $out/etc/systemd/{system,user}
-
+    mkdir -p $out/bin
     cp bin/* $out/bin
-  '' + lib.optionalString (stdenv.isLinux) ''
-    substitute etc/linux-systemd/system/syncthing-resume.service \
-               $out/etc/systemd/system/syncthing-resume.service \
-               --replace /usr/bin/pkill ${pkgs.procps}/bin/pkill
-
-    substitute etc/linux-systemd/system/syncthing@.service \
-               $out/etc/systemd/system/syncthing@.service \
-               --replace /usr/bin/syncthing $out/bin/syncthing
-
-    substitute etc/linux-systemd/user/syncthing.service \
-               $out/etc/systemd/user/syncthing.service \
-               --replace /usr/bin/syncthing $out/bin/syncthing
-  '';
-
-  preFixup = ''
-    find $out/bin -type f -exec ${removeExpr go} '{}' '+'
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = https://www.syncthing.net/;
     description = "Open Source Continuous File Synchronization";
-    license = licenses.mpl20;
-    maintainers = with maintainers; [ pshendry joko peterhoeg ];
-    platforms = platforms.unix;
+    license = stdenv.lib.licenses.mpl20;
+    maintainers = with stdenv.lib.maintainers; [ pshendry joko peterhoeg ];
+    platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd;
   };
 }
