lix-project/lix
18
38
Fork 14
Code Issues 286 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Fix GitHub VM test

Browse source
This commit is contained in:
Eelco Dolstra 2020-03-20 15:03:18 +01:00
parent bc5d4843a9
commit 4e67f89f38
2 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -2,14 +2,14 @@
"inputs": { "inputs": {
"nixpkgs": { "nixpkgs": {
"info": { "info": {
"lastModified": 1584691855, "lastModified": 1584712526,
"narHash": "sha256-3cXP6khHTwLmy3uDQc+zCp2e+ZK0YPWgS4vldyrrNow=" "narHash": "sha256-aoYSp+cpgZT7o4tC7XeXqHCC60Acw7SSGxMvdnQfuZQ="
}, },
"inputs": {}, "inputs": {},
"locked": { "locked": {
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4362edf3c3c4316e14c2b7844e2ad5678885914a", "rev": "81fa5f4501372671b464fe0104fe47f5327b46fe",
"type": "github" "type": "github"
}, },
"original": { "original": {

44
tests/github-flakes.nix
View file

@ -68,29 +68,26 @@ makeTest (
services.httpd.extraConfig = '' services.httpd.extraConfig = ''
ErrorLog syslog:local6 ErrorLog syslog:local6
''; '';
services.httpd.virtualHosts = services.httpd.virtualHosts."github.com" =
[ { hostName = "github.com"; { forceSSL = true;
enableSSL = true; sslServerKey = "${cert}/server.key";
sslServerKey = "${cert}/server.key"; sslServerCert = "${cert}/server.crt";
sslServerCert = "${cert}/server.crt"; servedDirs =
servedDirs = [ { urlPath = "/NixOS/flake-registry/raw/master";
[ { urlPath = "/NixOS/flake-registry/raw/master"; dir = registry;
dir = registry; }
} ];
]; };
} services.httpd.virtualHosts."api.github.com" =
{ forceSSL = true;
{ hostName = "api.github.com"; sslServerKey = "${cert}/server.key";
enableSSL = true; sslServerCert = "${cert}/server.crt";
sslServerKey = "${cert}/server.key"; servedDirs =
sslServerCert = "${cert}/server.crt"; [ { urlPath = "/repos/NixOS/nixpkgs";
servedDirs = dir = api;
[ { urlPath = "/repos/NixOS/nixpkgs"; }
dir = api; ];
} };
];
}
];
}; };
client = client =
@ -98,6 +95,7 @@ makeTest (
{ virtualisation.writableStore = true; { virtualisation.writableStore = true;
virtualisation.diskSize = 2048; virtualisation.diskSize = 2048;
virtualisation.pathsInNixDB = [ pkgs.hello pkgs.fuse ]; virtualisation.pathsInNixDB = [ pkgs.hello pkgs.fuse ];
virtualisation.memorySize = 4096;
nix.binaryCaches = lib.mkForce [ ]; nix.binaryCaches = lib.mkForce [ ];
nix.extraOptions = "experimental-features = nix-command flakes"; nix.extraOptions = "experimental-features = nix-command flakes";
environment.systemPackages = [ pkgs.jq ]; environment.systemPackages = [ pkgs.jq ];