Skip to content

Commit

Permalink
Revert "Merge pull request nix-community#762 from Rhys-T/remove-distu…
Browse files Browse the repository at this point in the history
…tils"

This reverts commits 1ec6e1a and
ced35f7, reversing
changes made to 4d07169.
  • Loading branch information
Rhys-T committed Sep 17, 2024
1 parent d43ade9 commit 1ba81fc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion bin/nur
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell
#!nix-shell -p python3 -p nix-prefetch-git -p nix -i python3
#!nix-shell -p python3 -p nix-prefetch-git -p nix -i python3 -p python3Packages.distutils
import sys
import os

Expand Down
9 changes: 3 additions & 6 deletions ci/nur/combine.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
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
Expand Down Expand Up @@ -50,9 +51,7 @@ def commit_repo(repo: Repo, message: str, path: Path) -> Repo:
assert tmp is not None

try:
shutil.copytree(
repo_source(repo.name), tmp.name, symlinks=True, dirs_exist_ok=True
)
copy_tree(repo_source(repo.name), tmp.name, preserve_symlinks=1)
shutil.rmtree(repo_path, ignore_errors=True)
os.rename(tmp.name, repo_path)
tmp = None
Expand Down Expand Up @@ -161,9 +160,7 @@ def setup_combined() -> None:
write_json_file(dict(repos={}), manifest_path)

manifest_lib = "lib"
shutil.copytree(
str(ROOT.joinpath("lib")), manifest_lib, symlinks=True, dirs_exist_ok=True
)
copy_tree(str(ROOT.joinpath("lib")), manifest_lib, preserve_symlinks=1)
default_nix = "default.nix"
shutil.copy(ROOT.joinpath("default.nix"), default_nix)

Expand Down

0 comments on commit 1ba81fc

Please sign in to comment.