diff --git a/nixos/doc/manual/release-notes/rl-2103.xml b/nixos/doc/manual/release-notes/rl-2103.xml index f33b4ef919f..e5c93f5c513 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: services.restic now uses a dedicated cache directory for every backup defined in services.restic.backups. The old global cache directory, /root/.cache/restic, is now unused and can be removed to free up disk space. + + + isync: The isync compatibility wrapper was removed and the Master/Slave + terminology has been deprecated and should be replaced with Far/Near in the configuration file. + + diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index a35b7b9c8c2..59315c4bf4b 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 04fb6805e96..c561e1de989 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 { };