From 4e67f89f380d97bab4018480e349d18e3850436f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 20 Mar 2020 15:03:18 +0100
Subject: Fix GitHub VM test

---
 flake.lock              |  6 +++---
 tests/github-flakes.nix | 44 +++++++++++++++++++++-----------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2d2a49011..a652afced 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,14 +2,14 @@
   "inputs": {
     "nixpkgs": {
       "info": {
-        "lastModified": 1584691855,
-        "narHash": "sha256-3cXP6khHTwLmy3uDQc+zCp2e+ZK0YPWgS4vldyrrNow="
+        "lastModified": 1584712526,
+        "narHash": "sha256-aoYSp+cpgZT7o4tC7XeXqHCC60Acw7SSGxMvdnQfuZQ="
       },
       "inputs": {},
       "locked": {
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4362edf3c3c4316e14c2b7844e2ad5678885914a",
+        "rev": "81fa5f4501372671b464fe0104fe47f5327b46fe",
         "type": "github"
       },
       "original": {
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 ];
-- 
cgit v1.2.3