File tree Expand file tree Collapse file tree 5 files changed +152
-26
lines changed Expand file tree Collapse file tree 5 files changed +152
-26
lines changed Original file line number Diff line number Diff line change 44[ -f .envrc.local ] && source_env .envrc.local
55DEVSHELL_TARGET=${DEVSHELL_TARGET:- dev}
66
7- source_url \
8- " https://raw.githubusercontent.com/divnix/std/main/direnv_lib.sh" \
9- " sha256-JkRxy5PilGkOQcI/KaiZeyJKUTMTKduQwsw/ayUyz4k="
7+ # shellcheck disable=SC1090
8+ . " $( nix eval .# __std.direnv_lib)"
109use std nix " //automation/devshells:${DEVSHELL_TARGET} "
Original file line number Diff line number Diff line change 4242 inherit inputs ;
4343 cellsFrom = ./nix ;
4444 # debug = ["cells" "cloud" "nomadEnvs"];
45- organelles = [
45+ cellBlocks = [
4646 ( inputs . std . data "nomadEnvs" )
4747 ( inputs . std . data "constants" )
4848 ( inputs . std . data "alerts" )
Original file line number Diff line number Diff line change 201201 inputs . bitte-cells . _utils . library . mkMonitoring
202202 # Alert attrset
203203 {
204- # Organelle local declared dashboards
204+ # Cell Block local declared dashboards
205205 inherit
206206 ( cell . alerts )
207207 ci-world-spongix
233233 }
234234 # Dashboard attrset
235235 {
236- # Organelle local declared dashboards
236+ # Cell block local declared dashboards
237237 inherit
238238 ( cell . dashboards )
239239 ci-world-spongix
Original file line number Diff line number Diff line change 1313 closureRootPaths :
1414 # The arguments to nix2container's buildImage or buildLayer function to enrich.
1515 args : let
16- inherit ( inputs . nixpkgs ) lib cacert symlinkJoin closureInfo runCommandNoCC ;
16+ inherit ( inputs . nixpkgs ) lib cacert symlinkJoin closureInfo runCommand ;
1717
1818 closure = closureInfo {
1919 rootPaths = { inherit cacert ; } // closureRootPaths ;
2020 } ;
2121
22- global = runCommandNoCC "global" { } ''
22+ global = runCommand "global" { } ''
2323 mkdir -p $out $out/etc
2424 cp ${ closure } /registration $out
2525
3030 echo 'nixbld1:!:30001:30000:Nix build user 1:/var/empty:/bin/nologin' >> $out/etc/passwd
3131 '' ;
3232
33- nixConf = runCommandNoCC "nix.conf" { } ''
33+ nixConf = runCommand "nix.conf" { } ''
3434 mkdir -p $out/etc/nix
3535 cat > $out/etc/nix/nix.conf <<'EOF'
3636 # If /dev/kvm does not actually exist in the container
4343 EOF
4444 '' ;
4545
46- tmp = runCommandNoCC "tmp" { } ''
46+ tmp = runCommand "tmp" { } ''
4747 mkdir -p $out/tmp
4848 '' ;
4949 in
You can’t perform that action at this time.
0 commit comments