colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #303597 from tfc/nixos-integration-tests-macos-platforms 

NixOS Integration tests: Re-enable for macOS
This commit is contained in:
K900 2024-04-12 15:44:28 +03:00 committed by GitHub
parent 0296a66b61 8d3a38e8b1
commit 8f1a3fbaa9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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 {
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.
'';

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

@ -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;