From 349cf2ea3ac535c50f4817644303465a13012627 Mon Sep 17 00:00:00 2001 From: Further <55025025+ifurther@users.noreply.github.com> Date: Tue, 12 Jul 2022 01:08:40 +0800 Subject: [PATCH 1/3] rrsync: change per script to python script (cherry picked from commit a91cea12b15e4941570928533a21e64293e9d8b6) --- pkgs/applications/networking/sync/rsync/rrsync.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index a85df8fa4682..8a8e5d4cee74 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, perl, rsync, fetchpatch }: +{ lib, stdenv, fetchurl, python, rsync, fetchpatch }: stdenv.mkDerivation { pname = "rrsync"; inherit (rsync) version src; - buildInputs = [ rsync perl ]; + buildInputs = [ rsync python ]; # Skip configure and build phases. # We just want something from the support directory From 00d1455561228fd2b91618c54b5f37bb0042276f Mon Sep 17 00:00:00 2001 From: Further <55025025+ifurther@users.noreply.github.com> Date: Tue, 12 Jul 2022 03:30:48 +0800 Subject: [PATCH 2/3] rrsync: fixed python3 and add braceexpand module (cherry picked from commit 9d7d8c11ebc7f055b212859a17671683996129be) --- pkgs/applications/networking/sync/rsync/rrsync.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 8a8e5d4cee74..34e4b390f4a6 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, fetchurl, python, rsync, fetchpatch }: +{ lib, stdenv, fetchurl, python3, rsync, fetchpatch }: stdenv.mkDerivation { pname = "rrsync"; inherit (rsync) version src; - buildInputs = [ rsync python ]; - + buildInputs = [ + rsync + (python3.withPackages (pythonPackages: with pythonPackages; [ braceexpand ])) + ]; # Skip configure and build phases. # We just want something from the support directory dontConfigure = true; From 24cff153163def18a7bbe70aa45385a4264d5620 Mon Sep 17 00:00:00 2001 From: Further <55025025+ifurther@users.noreply.github.com> Date: Tue, 12 Jul 2022 18:17:39 +0800 Subject: [PATCH 3/3] rrsync: clean unused part (cherry picked from commit c19c7d96c52c4b37e6c608e34d4159c93b84967e) --- pkgs/applications/networking/sync/rsync/rrsync.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix index 34e4b390f4a6..09f9ab22f335 100644 --- a/pkgs/applications/networking/sync/rsync/rrsync.nix +++ b/pkgs/applications/networking/sync/rsync/rrsync.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, rsync, fetchpatch }: +{ stdenv, python3, rsync }: stdenv.mkDerivation { pname = "rrsync";