From e14f2525d5d9babbf4bc502a2d8c8f11e950d887 Mon Sep 17 00:00:00 2001 From: trev Date: Fri, 15 Aug 2025 02:17:05 -0400 Subject: [PATCH] fix: switch from depricated distutils copy_tree to shutil.copytree --- bin/nur | 2 +- ci/nur/combine.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/nur b/bin/nur index 054e5794e..998edbeb0 100755 --- a/bin/nur +++ b/bin/nur @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -p python3 -p nix-prefetch-git -p nix -i python3 -p python3Packages.distutils +#!nix-shell -p python3 -p nix-prefetch-git -p nix -i python3 import sys import os diff --git a/ci/nur/combine.py b/ci/nur/combine.py index 4003195d6..5e0df2906 100644 --- a/ci/nur/combine.py +++ b/ci/nur/combine.py @@ -3,7 +3,6 @@ import os import shutil import subprocess from argparse import Namespace -from distutils.dir_util import copy_tree from pathlib import Path from tempfile import TemporaryDirectory from typing import Dict, List, Optional @@ -51,7 +50,7 @@ def commit_repo(repo: Repo, message: str, path: Path) -> Repo: assert tmp is not None try: - copy_tree(repo_source(repo.name), tmp.name, preserve_symlinks=1) + shutil.copytree(repo_source(repo.name), tmp.name, symlinks=True) shutil.rmtree(repo_path, ignore_errors=True) os.rename(tmp.name, repo_path) tmp = None @@ -160,7 +159,7 @@ def setup_combined() -> None: write_json_file(dict(repos={}), manifest_path) manifest_lib = "lib" - copy_tree(str(ROOT.joinpath("lib")), manifest_lib, preserve_symlinks=1) + shutil.copytree(str(ROOT.joinpath("lib")), manifest_lib, symlinks=True) default_nix = "default.nix" shutil.copy(ROOT.joinpath("default.nix"), default_nix)