-
-
Notifications
You must be signed in to change notification settings - Fork 13.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #291814 from NixOS/backport-279035-to-release-23.11
- Loading branch information
Showing
3 changed files
with
67 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
pkgs/development/tools/build-managers/bear/fix-functional-tests.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
diff --git a/test/lit.cfg b/test/lit.cfg | ||
index 118c979..b69fecc 100644 | ||
--- a/test/lit.cfg | ||
+++ b/test/lit.cfg | ||
@@ -207,13 +207,8 @@ def is_preload_disabled(): | ||
if is_windows: | ||
return True | ||
elif sys.platform == 'darwin': | ||
- command = ['csrutil', 'status'] | ||
- pattern = re.compile(r'System Integrity Protection status:\s+enabled') | ||
- try: | ||
- output = subprocess.check_output(command, stderr=subprocess.STDOUT) | ||
- return any(pattern.match(line) for line in output.decode('utf-8').splitlines()) | ||
- except (OSError, subprocess.CalledProcessError): | ||
- return False | ||
+ # csrutil(8) isn't available in the Nix build sandbox. | ||
+ return True | ||
else: | ||
return False | ||
|
||
@@ -221,6 +216,11 @@ def is_preload_disabled(): | ||
if not is_preload_disabled(): | ||
config.available_features.add('preload') | ||
|
||
+# Preserve the variables required for the Nix toolchain wrappers. | ||
+for var, value in os.environ.items(): | ||
+ if var.startswith('NIX_'): | ||
+ config.environment[var] = value | ||
+ | ||
print(config.substitutions) | ||
print(config.environment) | ||
print(config.available_features) |
27 changes: 0 additions & 27 deletions
27
pkgs/development/tools/build-managers/bear/no-double-relative.patch
This file was deleted.
Oops, something went wrong.