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 pull request #5323 from offlinehacker/gitlab_i686_fix

Browse source 
gitlab: fix i686-linux build and module
This commit is contained in:
Domen Kožar 2014-12-14 09:48:44 +01:00
commit ba5fad6dfa
6 changed files with 11 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/misc/gitlab.nix
View file

@ -193,6 +193,7 @@ in {
gitAndTools.git
ruby
openssh
nodejs
];
serviceConfig = {
Type = "simple";
@ -227,6 +228,7 @@ in {
gitAndTools.git
ruby
openssh
nodejs
];
preStart = ''
# TODO: use env vars

3
nixos/tests/gitlab.nix
View file

@ -14,6 +14,7 @@ import ./make-test.nix {
testScript = ''
$gitlab->start();
$gitlab->waitForUnit("gitlab.service");
$gitlab->waitUntilSucceeds("curl http://localhost:8080");
$gitlab->waitForUnit("gitlab-sidekiq.service");
$gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in");
'';
}