about summary refs log tree commit diff
path: root/nixos/modules/services/continuous-integration/jenkins
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-10-06 15:32:17 +0200
committerVladimír Čunát <vcunat@gmail.com>2015-10-13 20:18:48 +0200
commit99e4371526a9cc48f1f10e2e9f144e3e839ad709 (patch)
tree1cc37b42aae06673023c0e7c4168dda47d12f182 /nixos/modules/services/continuous-integration/jenkins
parente71c9cfaa23ddaffc03667e2020cf2ee6bd71fb7 (diff)
downloadnixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar
nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.gz
nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.bz2
nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.lz
nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.xz
nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.tar.zst
nixlib-99e4371526a9cc48f1f10e2e9f144e3e839ad709.zip
curl: split into multiple outputs
Also use pkgconfig to be safer and fix (some) referrers.
Diffstat (limited to 'nixos/modules/services/continuous-integration/jenkins')
-rw-r--r--nixos/modules/services/continuous-integration/jenkins/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 95d2aecfac7d..31e585f211fe 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -117,11 +117,11 @@ in {
       '';
 
       postStart = ''
-        until ${pkgs.curl}/bin/curl -s -L localhost:${toString cfg.port} ; do
+        until ${pkgs.curl.bin}/bin/curl -s -L localhost:${toString cfg.port} ; do
           sleep 10
         done
         while true ; do
-          index=`${pkgs.curl}/bin/curl -s -L localhost:${toString cfg.port}`
+          index=`${pkgs.curl.bin}/bin/curl -s -L localhost:${toString cfg.port}`
           if [[ !("$index" =~ 'Please wait while Jenkins is restarting' ||
                   "$index" =~ 'Please wait while Jenkins is getting ready to work') ]]; then
             exit 0