diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/networking/sync')
8 files changed, 64 insertions, 135 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix index 6244cd661d0a..73b40ea111a7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix @@ -1,34 +1,40 @@ -{stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfs-fuse, encfs }: +{stdenv, lib, fetchFromGitHub, makeWrapper, gettext, +python3, rsync, cron, openssh, sshfs-fuse, encfs }: let - inherit (python3Packages) python dbus-python keyring; -in stdenv.mkDerivation rec { - version = "1.1.24"; + python' = python3.withPackages (ps: with ps; [ dbus-python keyring ]); + apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; +in stdenv.mkDerivation rec { pname = "backintime-common"; + version = "1.2.1"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "0g6gabnr60ns8854hijdddbanks7319q4n3fj5l6rc4xsq0qck18"; + sha256 = "mBjheLY7DHs995heZmxVnDdvABkAROCjRJ4a/uJmJcg="; }; - buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ]; + nativeBuildInputs = [ makeWrapper gettext ]; + buildInputs = [ python' ]; installFlags = [ "DEST=$(out)" ]; - preConfigure = "cd common"; + preConfigure = '' + cd common + substituteInPlace configure \ + --replace "/.." "" \ + --replace "share/backintime" "${python'.sitePackages}/backintime" + substituteInPlace "backintime" \ + --replace "share" "${python'.sitePackages}" + ''; dontAddPrefix = true; - preFixup = - '' - substituteInPlace "$out/bin/backintime" \ - --replace "=\"/usr/share" "=\"$prefix/share" + preFixup = '' wrapProgram "$out/bin/backintime" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PATH : "$prefix/bin:$PATH" + --prefix PATH : ${apps} ''; meta = { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/backintime/qt.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/backintime/qt.nix new file mode 100644 index 000000000000..a48d6d8804fe --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/backintime/qt.nix @@ -0,0 +1,26 @@ +{ mkDerivation, backintime-common, python3 }: + +let + python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common ]); +in +mkDerivation { + inherit (backintime-common) + version src installFlags meta dontAddPrefix nativeBuildInputs; + + pname = "backintime-qt"; + + buildInputs = [ python' backintime-common ]; + + preConfigure = '' + cd qt + substituteInPlace configure \ + --replace '"/../etc' '"/etc' + substituteInPlace qttools.py \ + --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' + ''; + + preFixup = '' + wrapQtApp "$out/bin/backintime-qt" \ + --prefix PATH : "${backintime-common}/bin:$PATH" + ''; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix deleted file mode 100644 index b72ddc8bae63..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }: - -stdenv.mkDerivation { - inherit (backintime-common) version src installFlags; - - pname = "backintime-qt4"; - - buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ]; - - preConfigure = "cd qt4"; - configureFlags = [ ]; - - dontAddPrefix = true; - - preFixup = - '' - substituteInPlace "$out/bin/backintime-qt4" \ - --replace "=\"/usr/share" "=\"$prefix/share" - - wrapProgram "$out/bin/backintime-qt4" \ - --prefix PYTHONPATH : "${backintime-common}/share/backintime/common:$PYTHONPATH" \ - --prefix PATH : "${backintime-common}/bin:$PATH" - ''; - - meta = with stdenv.lib; { - broken = true; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index bd68531db190..2f0a9a044f24 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.53.1"; + version = "1.53.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1yi6n5ip680ydqhz8fnd0igr8dy7zzhpx37mdgahsfac7cwf6k0q"; + sha256 = "10nimrq8nmpmfk2d4fx0yp916wk5q027m283izpshrbwvx7l6xx0"; }; vendorSha256 = "1l4iz31k1pylvf0zrp4nhxna70s1ma4981x6q1s3dhszjxil5c88"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix index 2728d8484ef1..e07fecbf8936 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix @@ -35,7 +35,21 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableXXHash xxHash; nativeBuildInputs = [perl]; - configureFlags = ["--with-nobody-group=nogroup"]; + configureFlags = [ + "--with-nobody-group=nogroup" + + # disable the included zlib explicitly as it otherwise still compiles and + # links them even. + "--with-included-zlib=no" + ] + # Work around issue with cross-compilation: + # configure.sh: error: cannot run test program while cross compiling + # Remove once 3.2.4 or more recent is released. + # The following PR should fix the cross-compilation issue. + # Test using `nix-build -A pkgsCross.aarch64-multiplatform.rsync`. + # https://github.com/WayneD/rsync/commit/b7fab6f285ff0ff3816b109a8c3131b6ded0b484 + ++ stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "--enable-simd=no" + ; passthru.tests = { inherit (nixosTests) rsyncd; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/4.08-compatibility.patch b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/4.08-compatibility.patch deleted file mode 100644 index a6921b516f07..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/4.08-compatibility.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001 -From: Jaap Boender <jaapb@kerguelen.org> -Date: Thu, 21 Mar 2019 12:26:51 +0000 -Subject: [PATCH] Compatibility with OCaml 4.08 - ---- - src/files.ml | 2 +- - src/recon.ml | 4 ++-- - src/system/system_generic.ml | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/files.ml b/src/files.ml -index ba42ad57..5babf21e 100644 ---- a/src/files.ml -+++ b/src/files.ml -@@ -722,7 +722,7 @@ let get_files_in_directory dir = - with End_of_file -> - dirh.System.closedir () - end; -- Sort.list (<) !files -+ List.sort String.compare !files - - let ls dir pattern = - Util.convertUnixErrorsToTransient -diff --git a/src/recon.ml b/src/recon.ml -index 5ed358d7..0df2cfe4 100644 ---- a/src/recon.ml -+++ b/src/recon.ml -@@ -651,8 +651,8 @@ let rec reconcile - - (* Sorts the paths so that they will be displayed in order *) - let sortPaths pathUpdatesList = -- Sort.list -- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0) -+ List.sort -+ Path.compare - pathUpdatesList - - let rec enterPath p1 p2 t = -diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml -index ed8e18f3..0e28a781 100755 ---- a/src/system/system_generic.ml -+++ b/src/system/system_generic.ml -@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen - let chmod = Unix.chmod - let chown = Unix.chown - let utimes = Unix.utimes --let link = Unix.link -+let link s d = Unix.link s d - let openfile = Unix.openfile - let opendir f = - let h = Unix.opendir f in diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/default.nix index 7b7318544c56..36e803509262 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/default.nix @@ -6,12 +6,12 @@ let inherit (ocamlPackages) ocaml lablgtk; in stdenv.mkDerivation (rec { pname = "unison"; - version = "2.51.2"; + version = "2.51.3"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "1bykiyc0dc5pkw8x370qkg2kygq9pq7yqzsgczd3y13b6ivm4sdq"; + sha256 = "sha256-42hmdMwOYSWGiDCmhuqtpCWtvtyD2l+kA/bhHD/Qh5Y="; }; buildInputs = [ ocaml makeWrapper ncurses ]; @@ -27,12 +27,6 @@ stdenv.mkDerivation (rec { "UISTYLE=${if enableX11 then "gtk2" else "text"}" ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; - patches = [ - # NOTE: Only needed until Unison 2.51.3 is released! - ./4.08-compatibility.patch - ./lablgtk.patch - ]; - preInstall = "mkdir -p $out/bin"; postInstall = if enableX11 then '' diff --git a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/lablgtk.patch b/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/lablgtk.patch deleted file mode 100644 index 20c1db1b1166..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/networking/sync/unison/lablgtk.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2e7ea9481c6c3ff2ec513c39f73cfe15c0763c06 Mon Sep 17 00:00:00 2001 -From: daviddavid <geiger.david68210@gmail.com> -Date: Mon, 26 Feb 2018 13:36:36 +0100 -Subject: [PATCH] Fix for lablgtk >= 2.18.6 - ---- - src/uigtk2.ml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/uigtk2.ml b/src/uigtk2.ml -index 2ba6d79..04c4da4 100644 ---- a/src/uigtk2.ml -+++ b/src/uigtk2.ml -@@ -89,12 +89,12 @@ let fontItalic = lazy (Pango.Font.from_string "italic") - (* This does not work with the current version of Lablgtk, due to a bug - let icon = - GdkPixbuf.from_data ~width:48 ~height:48 ~has_alpha:true -- (Gpointer.region_of_string Pixmaps.icon_data) -+ (Gpointer.region_of_bytes Pixmaps.icon_data) - *) - let icon = - let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in - Gpointer.blit -- (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p); -+ (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p); - p - - let leftPtrWatch = --- -2.25.1 - |