movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse source 
Conflicts:
- nixos/doc/manual/release-notes/rl-2305.section.md
This commit is contained in:
Martin Weinelt 2023-03-21 12:35:40 +01:00
commit ffe3165b27
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
69 changed files with 535 additions and 948 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/gollum.nix
View file

@ -9,6 +9,6 @@ import ./make-test-python.nix ({ pkgs, ... }: {
testScript = { nodes, ... }: ''
webserver.wait_for_unit("gollum")
webserver.wait_for_open_port(${toString nodes.webserver.config.services.gollum.port})
webserver.wait_for_open_port(${toString nodes.webserver.services.gollum.port})
'';
})