movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 21:25:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

caddy: build with default go and fix tests

Browse source
This commit is contained in:
Nick Cao 2021-09-01 15:15:50 +08:00
parent 538f369fb5
commit 83b48cc589
No known key found for this signature in database
GPG key ID: 068A56CEF48FA2C1
2 changed files with 49 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nixos/tests/caddy.nix
View file

@ -50,6 +50,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
}; };
}; };
}; };
};
testScript = { nodes, ... }: testScript = { nodes, ... }:
let let
@ -103,4 +104,4 @@ import ./make-test-python.nix ({ pkgs, ... }: {
webserver.wait_for_open_port("8080") webserver.wait_for_open_port("8080")
webserver.wait_for_open_port("8081") webserver.wait_for_open_port("8081")
''; '';
}) })

4
pkgs/top-level/all-packages.nix
View file

@ -2180,9 +2180,7 @@ with pkgs;
''; '';
}); });
caddy = callPackage ../servers/caddy { caddy = callPackage ../servers/caddy { };
buildGoModule = buildGo115Module;
};
traefik = callPackage ../servers/traefik { }; traefik = callPackage ../servers/traefik { };