From 39a8e1d1719c19a34efee01f5b3a50a7c65e47b0 Mon Sep 17 00:00:00 2001
From: Valentin Reis <vreis@anl.gov>
Date: Tue, 4 Jun 2019 10:52:46 -0500
Subject: [PATCH] ci runner deployment fix

---
 deployments/argo.nixops       | Bin 65536 -> 65536 bytes
 deployments/ci.nix            |   8 ++++----
 deployments/deploy-runners.sh |   3 +++
 pkgs/default.nix              |  10 +++++++++-
 4 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100755 deployments/deploy-runners.sh

diff --git a/deployments/argo.nixops b/deployments/argo.nixops
index b56f471106f1085ac2d5ab0b13364c6476a55936..f329596d779316f56fc51e541f59dccc7bdd21df 100644
GIT binary patch
delta 1213
zcmbV~L1^1%6vxpgS(3lhaT3Q#oY}EUI!bBl>XYPHhCvQxv}Ie<9R|CsjV;@f9ovy5
zW6OqsGuUAa+I3HDmXL1jy3;mYLkl|$dfIKbf}LC%N;?L-r>aUa!wzFPKHmTL{@?$-
zuit0-edg<TsPz5#RVw}S>fM`E9R9rd9+iMgE6XWO&07_@XbMXmQ?M1;%qb+3>FL!9
z>BxD#=6<yjnqYS`%qNQo$jTLj9=X5YnH7*T<37Llgo)z$DTZ1^W9oXNT+yss`Ie4j
zu;(NZo`Yx3y=jal8R{$=YvoO?)VjWIwJ`1WA6%nic-lvUqi7_>P|NVww-I=<#lMTE
z!VHx_d~4mPmD;5m9`^};ln6m;D|rE*@s-?(a@JRJqske7_U5)f`y!6|1baeE`UE>l
zOuQiw3(fCh2#4LLTfa~UbFi^}6=4j&Zr`|sgJTR8MZvXF*TMlmDL0ao^}C$kWgxqA
z4&gEQY)3?xckk~Q?<2Ge^k8v{{ekTV7U(_t5xp^fB{T>bpbSKB$?(xIF8$Y$E;lOn
zx?x?e=T*JZC|OA-3cJG;?@R}%#O4P<n0ygQ6^eqb*?C!$J6%&OR&wn^R=3N&c1_o^
zqE&^}Kce3paq#?Tj{eYzKy47u{(oa{hs$9YKAgv-?o9gjtY<%+v}*NsCev-IYk8Zf
zYeGh>RaHeP)~ZW|a<}}}-FxyxfLh$7Sy<hhIYsU;G>?*Cyd2(0INs{dUSR(@1`%^<
zLgch0rA2|n9qjeb^Z)J>BBZ6yZ#%&N75yT^yFVR%N@1_&{hIY_dconKf3UzWIIK73
zA_sR5XF`N5dAfkF3!ZR{UvqD{ghRuZhe_lh_s7HEXu9r<!{cErWs6y9jpVFGfhdY8
zcSONzW;L@}HI%NMDc6s$6WNa;Cj{yJ)BK7vu(6+XKYn#*0y*>W{eCQ^cB^`>TF`8v
zCz_;ZcXfR!FB7R~7j)AQi^sNqzp;%$_~10Qb8!10=_Q?oXM<Qu6P0F9AyTth?DQ(_
Xo?6ISq+yg*NiyVO*FLrshjXt1ov?<1

delta 1193
zcmbV~%Wo4`6vi`m#-6#j5s+Yt!LD6}E?O|m9giQ=(uOugv?`ExQK?c@$aw77gJ+x>
zkL8yX$*#l#Rf2{SNE4x|-Bv0Ero2;<(uc~59lJ<zvLUJp>R*uB7X^7&!Sd+*zVm(O
z+}mt&%_jHtE+#q^9ATnY#?BmLw!xEQ2N*x>9UYF;Nj_(1Y{jt@u`0_ABbAo5@t8iY
z8AXyW#N4k&`?q+f<J_l12*~JugwDGUPP{B4c-MV&c7gNbTLT<3gnZgWaa_+iAFJg&
zz6tZwVT5nM()8JF_{Xgr^D6R{)lx27{$Ro><4bPy{9z`5?@=l4mHryxm|^($n?YEZ
z5njWKn>i+ggz|)CWGh(%&r^latGEM^neglQHYNFI<N_u6Uh*!T-I}Gd-@w06h4-1_
z532C?Dt_-O5VTfyBK(_sf95KK@O7A+9YOeKxHtRZUi_1fWBdpgvULYvql@xAi@LPS
z)9w{W&h19{Dts{~A$-}LnzIg}ehb*;p#jgB=b$I->0`fTC)v;0m(WE>ElZsn!_jsy
z`G0Q|E$X!i%ZZw*me-3}CkzKWu{T5e!p=>^gkcX8YJJ4R*1rcM1xqcFc%z_Oq!N==
zIhibJbw#&xwVG*HQzaOC=s&m4!=v>b>=AeejOAeJ`R(8C+Vk*zdzSzQsJlSj^Nws;
z>4tXF63vVurV1s^%3GwNXlX4IlNuZDfBh2>;4Kd`)M5n~o8SHd5#H=Z5S~U*XapaP
zP)nO?ML(HQ(<xGObg^O+LsQ}<Nw*TDnoc~85D_3n?R{PQ*z;c?3HEwecm)!jufGSw
znYHcxgvehWhq#CFpNeDm^4ez%8w44?TMc%&SeN6woR^S92qb8(hBkG0LV2F@-CCrz
zm)2aT-tR819%tAP?1R&5VFXe4hqXUhuCK4JJ=I!rKY4s&3xY#%w;hP6qS>%*%dksw
zT+vJ;ZAy|<aqMKywi{Ja*|`4TN&vz8ux};!0*jBp<Vu(|;XPPd4n&IeR9&&^=D3=!
aCyJsbDx@M;#YQDZVpbxP+pv_{JN^UFHk42R

diff --git a/deployments/ci.nix b/deployments/ci.nix
index 34cb61a..4d92cb4 100644
--- a/deployments/ci.nix
+++ b/deployments/ci.nix
@@ -67,8 +67,8 @@ let
       options = ''--max-freed "$((32 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | ${pkgs.gawk}/bin/awk '{ print $4 }')))"'';
     };
    services.openssh.enable = true;
-   users.extraUsers.root.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)];
-   users.extraUsers.fre.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)];
+   users.extraUsers.root.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)] ++ keys;
+   users.extraUsers.fre.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)] ++ keys ;
    };
    mkBigChameleonRunner = ip: name: a@{...}:
     ((mkChameleonRunner ip name a)//
@@ -184,7 +184,7 @@ in
         options = ''--max-freed "$((32 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | ${pkgs.gawk}/bin/awk '{ print $4 }')))"'';
       };
      services.openssh.enable = true;
-     users.extraUsers.root.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)];
-     users.extraUsers.fre.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)];
+     users.extraUsers.root.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)] ++ keys;
+     users.extraUsers.fre.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)] ++ keys;
      };
    }
diff --git a/deployments/deploy-runners.sh b/deployments/deploy-runners.sh
new file mode 100755
index 0000000..f088560
--- /dev/null
+++ b/deployments/deploy-runners.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+nixops deploy -s argo.nixops --include gitlab-runner-0 gitlab-runner-1 gitlab-runner-2 gitlab-runner-3 gitlab-runner-4
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 8aa1557..d3e554e 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -48,6 +48,7 @@ let
     (old:{buildInputs=old.buildInputs ++ [ bi ];});
 
   argopkgs = rec {
+    singularity = bleeding.singularity;
 
     # library of nix expressions
     argolib       = import ../lib/utils.nix;
@@ -68,6 +69,13 @@ let
         cp -r examples $out/share
       '';
     });
+    nrm-virtualenv = nrm.overrideAttrs (o:{
+      buildInputs=o.buildInputs ++ [ pkgs.blas pkgs.liblapack pkgs.binutils-unwrapped];
+      buildPhase=''
+        virtualenv .
+        bin/pip install -r requirements.txt
+        '';
+    });
     containers    = callPackage ./containers {src=containers-src;};
     libnrm        = callPackage ./libnrm     {src=libnrm-src;};
     libnrm-pinned = callPackage ./libnrm     {src=fetched libnrm/pin.json;};
@@ -209,7 +217,7 @@ let
 
     # re-export from hpkgs and add non-haskell build rule specialization
     inherit (haskellPackages) repoquality;
-    inherit (bleedingHaskellPackages) dhall dhall-json;
+    inherit (bleedingHaskellPackages) dhall dhall-lsp-server dhall-json;
 
     nrm-schema = haskellPackages.nrm-schema.overrideAttrs (old:{
       buildInputs = old.buildInputs ++ [
-- 
2.26.2