aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2020-03-20 15:03:18 +0100
committerEelco Dolstra <edolstra@gmail.com>2020-03-20 15:03:18 +0100
commit4e67f89f380d97bab4018480e349d18e3850436f (patch)
treeab0105c88b61c2538eddded9c5f9c8b5ba436023 /tests
parentbc5d4843a916dc4f99516e187a63108e8006f81f (diff)
Fix GitHub VM test
Diffstat (limited to 'tests')
-rw-r--r--tests/github-flakes.nix44
1 files changed, 21 insertions, 23 deletions
diff --git a/tests/github-flakes.nix b/tests/github-flakes.nix
index a312cb83b..195772ca7 100644
--- a/tests/github-flakes.nix
+++ b/tests/github-flakes.nix
@@ -68,29 +68,26 @@ makeTest (
services.httpd.extraConfig = ''
ErrorLog syslog:local6
'';
- services.httpd.virtualHosts =
- [ { hostName = "github.com";
- enableSSL = true;
- sslServerKey = "${cert}/server.key";
- sslServerCert = "${cert}/server.crt";
- servedDirs =
- [ { urlPath = "/NixOS/flake-registry/raw/master";
- dir = registry;
- }
- ];
- }
-
- { hostName = "api.github.com";
- enableSSL = true;
- sslServerKey = "${cert}/server.key";
- sslServerCert = "${cert}/server.crt";
- servedDirs =
- [ { urlPath = "/repos/NixOS/nixpkgs";
- dir = api;
- }
- ];
- }
- ];
+ services.httpd.virtualHosts."github.com" =
+ { forceSSL = true;
+ sslServerKey = "${cert}/server.key";
+ sslServerCert = "${cert}/server.crt";
+ servedDirs =
+ [ { urlPath = "/NixOS/flake-registry/raw/master";
+ dir = registry;
+ }
+ ];
+ };
+ services.httpd.virtualHosts."api.github.com" =
+ { forceSSL = true;
+ sslServerKey = "${cert}/server.key";
+ sslServerCert = "${cert}/server.crt";
+ servedDirs =
+ [ { urlPath = "/repos/NixOS/nixpkgs";
+ dir = api;
+ }
+ ];
+ };
};
client =
@@ -98,6 +95,7 @@ makeTest (
{ virtualisation.writableStore = true;
virtualisation.diskSize = 2048;
virtualisation.pathsInNixDB = [ pkgs.hello pkgs.fuse ];
+ virtualisation.memorySize = 4096;
nix.binaryCaches = lib.mkForce [ ];
nix.extraOptions = "experimental-features = nix-command flakes";
environment.systemPackages = [ pkgs.jq ];