From d0b891c8284eed7e56f8a9b81cf5438667264317 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 4 Feb 2021 13:01:55 +0100
Subject: [PATCH] isync: 1.3.4 -> 1.4.0

Important changes:
- The 'isync' compatibility wrapper was removed.
- The Master/Slave configuration keywords where deprecated and should be
  replaced with Far/Near. All users should update their configuration
  file accordingly. It's a trivial change and the old Master/Slave
  keywords will still work for now but result in the following message:
  Notice: Master/Slave are deprecated; use Far/Near instead.

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 nixos/doc/manual/release-notes/rl-2103.xml |  6 ++++++
 pkgs/tools/networking/isync/default.nix    | 10 ++++++----
 pkgs/top-level/all-packages.nix            |  4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml
index f33b4ef919f0..e5c93f5c5138 100644
--- a/nixos/doc/manual/release-notes/rl-2103.xml
+++ b/nixos/doc/manual/release-notes/rl-2103.xml
@@ -666,6 +666,12 @@ self: super:
      <varname>services.restic</varname> now uses a dedicated cache directory for every backup defined in <varname>services.restic.backups</varname>. The old global cache directory, <literal>/root/.cache/restic</literal>, is now unused and can be removed to free up disk space.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     <literal>isync</literal>: The <literal>isync</literal> compatibility wrapper was removed and the Master/Slave
+     terminology has been deprecated and should be replaced with Far/Near in the configuration file.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix
index a35b7b9c8c27..59315c4bf4b3 100644
--- a/pkgs/tools/networking/isync/default.nix
+++ b/pkgs/tools/networking/isync/default.nix
@@ -1,18 +1,20 @@
 { lib, stdenv, fetchurl, pkg-config, perl
-, openssl, db, zlib, cyrus_sasl
+, openssl, db, cyrus_sasl, zlib
+, Security
 }:
 
 stdenv.mkDerivation rec {
   pname = "isync";
-  version = "1.3.4";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz";
-    sha256 = "0w9fqz1qsdm1zfpv9jp5v2dav6pyigf1n6x7asxi0fg58sf49sz8";
+    sha256 = "0pkqvsdmi85xrhzzc7mz87vdvvvp01lf8akhfdnmsdlks8zbzy44";
   };
 
   nativeBuildInputs = [ pkg-config perl ];
-  buildInputs = [ openssl db cyrus_sasl zlib ];
+  buildInputs = [ openssl db cyrus_sasl zlib ]
+    ++ lib.optionals stdenv.isDarwin [ Security ];
 
   meta = with lib; {
     homepage = "http://isync.sourceforge.net/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d1616cd4717..4f6d7b5be689 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5327,7 +5327,9 @@ in
 
   ispike = callPackage ../development/libraries/science/robotics/ispike { };
 
-  isync = callPackage ../tools/networking/isync { };
+  isync = callPackage ../tools/networking/isync {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   itm-tools = callPackage ../development/tools/misc/itm-tools { };