From 8d3a38e8b19bdd6bf2a2274c91697cd315de0403 Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Fri, 12 Apr 2024 13:41:27 +0200 Subject: [PATCH] NixOS Integration tests: Re-enable for macOS --- nixos/lib/testing/meta.nix | 2 +- pkgs/build-support/trivial-builders/test/default.nix | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix index 529fe714fcf6..bdf313e5b119 100644 --- a/nixos/lib/testing/meta.nix +++ b/nixos/lib/testing/meta.nix @@ -36,7 +36,7 @@ in }; platforms = lib.mkOption { type = types.listOf types.raw; - default = lib.platforms.linux; + default = lib.platforms.linux ++ lib.platforms.darwin; description = '' Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation. ''; diff --git a/pkgs/build-support/trivial-builders/test/default.nix b/pkgs/build-support/trivial-builders/test/default.nix index f41372d922bb..e1ed0be72bf3 100644 --- a/pkgs/build-support/trivial-builders/test/default.nix +++ b/pkgs/build-support/trivial-builders/test/default.nix @@ -20,11 +20,7 @@ recurseIntoAttrs { concat = callPackage ./concat-test.nix {}; linkFarm = callPackage ./link-farm.nix {}; overriding = callPackage ../test-overriding.nix {}; - # VM test not supported beyond linux yet - references = - if stdenv.hostPlatform.isLinux - then references - else {}; + inherit references; writeCBin = callPackage ./writeCBin.nix {}; writeClosure-union = callPackage ./writeClosure-union.nix { inherit (references) samples;