Merge pull request #443 from nix-community/fix-macos-only

nix-env: allow non-linux packages
This commit is contained in:
Jörg Thalheim 2022-05-14 16:51:39 +01:00 committed by GitHub
commit 18cccff25f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions

View file

@ -1,6 +1,7 @@
import json
import subprocess
import sys
import os
from argparse import Namespace
from pathlib import Path
from tempfile import NamedTemporaryFile
@ -73,9 +74,11 @@ callPackage (nur.repo-sources."%s" + "/%s") {}
with NamedTemporaryFile(mode="w") as f:
f.write(expr)
f.flush()
env = os.environ.copy()
env.update(NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM="1")
query_cmd = ["nix-env", "-qa", "*", "--json", "-f", str(f.name)]
try:
out = subprocess.check_output(query_cmd)
out = subprocess.check_output(query_cmd, env=env)
except subprocess.CalledProcessError:
print(f"failed to evaluate {repo}", file=sys.stderr)
return {}

View file

@ -49,9 +49,8 @@ import {EVALREPO_PATH} {{
# fmt: on
logger.info(f"Evaluate repository {repo.name}")
proc = subprocess.Popen(
cmd, env=dict(PATH=os.environ["PATH"]), stdout=subprocess.DEVNULL
)
env = dict(PATH=os.environ["PATH"], NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM="1")
proc = subprocess.Popen(cmd, env=env, stdout=subprocess.DEVNULL)
try:
res = proc.wait(10)
except subprocess.TimeoutExpired: