drop rsync patch again

nix-community · Nov 18, 2023 · 5317af5 · 5317af5
1 parent 0ff250c
commit 5317af5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 55 deletions.
diff --git a/src/default.nix b/src/default.nix
@@ -16,11 +16,6 @@
 , mkShellNoCC
 }:
 let
-  # TODO: add this to nixpkgs
-  rsync' = rsync.overrideAttrs (old: {
-    # https://github.com/WayneD/rsync/issues/511#issuecomment-1774612577
-    patches = [ ./rsync-fortified-strlcpy-fix.patch ];
-  });
   runtimeDeps = [
     gitMinimal # for git flakes
     # pinned because nix-copy-closure hangs if ControlPath provided for SSH: https://github.com/NixOS/nix/issues/8480
@@ -31,7 +26,7 @@ let
     gawk
     findutils
     gnused # needed by ssh-copy-id
-    rsync' # used to upload extra-files
+    rsync # used to upload extra-files
   ];
 in
 stdenv.mkDerivation {

diff --git a/src/rsync-fortified-strlcpy-fix.patch b/src/rsync-fortified-strlcpy-fix.patch