Merge pull request #5340 from edolstra/disable-current-unstable-macos

Disable testing against nixUnstable on macOS
This commit is contained in:
Eelco Dolstra 2021-10-06 14:34:25 +02:00 committed by GitHub
commit 987ca62cd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -491,7 +491,11 @@
let pkgs = nixpkgsFor.${system}; in
pkgs.runCommand "install-tests" {
againstSelf = testNixVersions pkgs pkgs.nix pkgs.pkgs.nix;
againstCurrentUnstable = testNixVersions pkgs pkgs.nix pkgs.nixUnstable;
againstCurrentUnstable =
# FIXME: temporarily disable this on macOS because of #3605.
if system == "x86_64-linux"
then testNixVersions pkgs pkgs.nix pkgs.nixUnstable
else null;
# Disabled because the latest stable version doesn't handle
# `NIX_DAEMON_SOCKET_PATH` which is required for the tests to work
# againstLatestStable = testNixVersions pkgs pkgs.nix pkgs.nixStable;