@@ -1,17 +1,19 @@
1+{
2+ supportedPlatforms ? [ "x86_64-linux" "x86_64-darwin" ]
3+}:
14let
25 nginxRoot = "/run/nginx";
36 obelisk = import ./default.nix {};
47 # Get NixOS a pre-release 20.03 that contains the python based tests and recursive nix
58 pkgs = import (builtins.fetchTarball https://github.com/nixos/nixpkgs/archive/3de5266.tar.gz) {};
6− supportedPlatforms = [ "x86_64-linux" "x86_64-darwin" ];
79 sshKeys = import (pkgs.path + /nixos/tests/ssh-keys.nix) pkgs;
810 make-test = import (pkgs.path + /nixos/tests/make-test-python.nix);
911 #supportedPlatforms = [ "x86_64-linux" ];
1012 obelisk-everywhere = (import ./everywhere.nix { cacheBuildSystems = supportedPlatforms; }).metaCache;
1113 snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text;
1214 snakeOilPublicKey = sshKeys.snakeOilPublicKey;
13−in
14− make-test ({...}: {
15+in obelisk-everywhere // {
16+ test = make-test ({...}: {
1517 name = "obelisk";
1618 nodes = {
1719 githost = {
@@ -38,7 +40,6 @@ in
3840 obelisk.shell
3941 obelisk-everywhere
4042 pkgs.git
41− pkgs.jq
4243 ];
4344 };
4445 };
@@ -104,4 +105,5 @@ in
104105 with subtest("test obelisk can detect private repos"):
105106 client.succeed("""grep -qF '"private": false' ~/code/myapp/git.json""")
106107 '';
107− })
108+ }) {};
109+}