nix/6.NUR
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #765 from Rhys-T/revert-remove-distutils

Browse source 
Revert "Merge pull request #762 from Rhys-T/remove-distutils"
This commit is contained in:
Jörg Thalheim 2024-09-18 11:31:02 +02:00 • committed by GitHub
commit 7f0582d8d2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/nur
View file

@ -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

9
ci/nur/combine.py
View file

@ -3,6 +3,7 @@ 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
@ -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
@ -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)