public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #111907 from primeos/isync

Browse Source 
isync: 1.3.4 -> 1.4.0
This commit is contained in:
Sandro 2021-02-04 20:14:39 +01:00 committed by GitHub
commit cb266f4b07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/doc/manual/release-notes/rl-2103.xml
View File

@ -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. <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> </para>
</listitem> </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> </itemizedlist>
</section> </section>
</section> </section>

10
pkgs/tools/networking/isync/default.nix
View File

@ -1,18 +1,20 @@
{ lib, stdenv, fetchurl, pkg-config, perl { lib, stdenv, fetchurl, pkg-config, perl
, openssl, db, zlib, cyrus_sasl , openssl, db, cyrus_sasl, zlib
, Security
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "isync"; pname = "isync";
version = "1.3.4"; version = "1.4.0";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/isync/${pname}-${version}.tar.gz";
sha256 = "0w9fqz1qsdm1zfpv9jp5v2dav6pyigf1n6x7asxi0fg58sf49sz8"; sha256 = "0pkqvsdmi85xrhzzc7mz87vdvvvp01lf8akhfdnmsdlks8zbzy44";
}; };
nativeBuildInputs = [ pkg-config perl ]; nativeBuildInputs = [ pkg-config perl ];
buildInputs = [ openssl db cyrus_sasl zlib ]; buildInputs = [ openssl db cyrus_sasl zlib ]
++ lib.optionals stdenv.isDarwin [ Security ];
meta = with lib; { meta = with lib; {
homepage = "http://isync.sourceforge.net/"; homepage = "http://isync.sourceforge.net/";

4
pkgs/top-level/all-packages.nix
View File

@ -5327,7 +5327,9 @@ in
ispike = callPackage ../development/libraries/science/robotics/ispike { }; 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 { }; itm-tools = callPackage ../development/tools/misc/itm-tools { };