Unverified Commit 8f1a3fba authored by K900's avatar K900 Committed by GitHub
Browse files

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

NixOS Integration tests: Re-enable for macOS
parents 0296a66b 8d3a38e8

nixos/lib/testing/meta.nix

+1 −1
Original line number Diff line number Diff line
@@ -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.

            '';

pkgs/build-support/trivial-builders/test/default.nix

+1 −5
Original line number Diff line number Diff line
@@ -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;