talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

NixOS Integration tests: Re-enable for macOS

Browse Source
This commit is contained in:
Jacek Galowicz 2024-04-12 13:41:27 +02:00
parent 92323443a5
commit 8d3a38e8b1
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/lib/testing/meta.nix
View File

@ -36,7 +36,7 @@ in
}; };
platforms = lib.mkOption { platforms = lib.mkOption {
type = types.listOf types.raw; type = types.listOf types.raw;
default = lib.platforms.linux; default = lib.platforms.linux ++ lib.platforms.darwin;
description = '' description = ''
Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation. Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation.
''; '';

6
pkgs/build-support/trivial-builders/test/default.nix
View File

@ -20,11 +20,7 @@ recurseIntoAttrs {
concat = callPackage ./concat-test.nix {}; concat = callPackage ./concat-test.nix {};
linkFarm = callPackage ./link-farm.nix {}; linkFarm = callPackage ./link-farm.nix {};
overriding = callPackage ../test-overriding.nix {}; overriding = callPackage ../test-overriding.nix {};
# VM test not supported beyond linux yet inherit references;
references =
if stdenv.hostPlatform.isLinux
then references
else {};
writeCBin = callPackage ./writeCBin.nix {}; writeCBin = callPackage ./writeCBin.nix {};
writeClosure-union = callPackage ./writeClosure-union.nix { writeClosure-union = callPackage ./writeClosure-union.nix {
inherit (references) samples; inherit (references) samples;