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 4
4
[ -f .envrc.local ] && source_env .envrc.local
5
5
DEVSHELL_TARGET=${DEVSHELL_TARGET:- dev}
6
6
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)"
10
9
use std nix " //automation/devshells:${DEVSHELL_TARGET} "
Original file line number Diff line number Diff line change 42
42
inherit inputs ;
43
43
cellsFrom = ./nix ;
44
44
# debug = ["cells" "cloud" "nomadEnvs"];
45
- organelles = [
45
+ cellBlocks = [
46
46
( inputs . std . data "nomadEnvs" )
47
47
( inputs . std . data "constants" )
48
48
( inputs . std . data "alerts" )
Original file line number Diff line number Diff line change 201
201
inputs . bitte-cells . _utils . library . mkMonitoring
202
202
# Alert attrset
203
203
{
204
- # Organelle local declared dashboards
204
+ # Cell Block local declared dashboards
205
205
inherit
206
206
( cell . alerts )
207
207
ci-world-spongix
233
233
}
234
234
# Dashboard attrset
235
235
{
236
- # Organelle local declared dashboards
236
+ # Cell block local declared dashboards
237
237
inherit
238
238
( cell . dashboards )
239
239
ci-world-spongix
Original file line number Diff line number Diff line change 13
13
closureRootPaths :
14
14
# The arguments to nix2container's buildImage or buildLayer function to enrich.
15
15
args : let
16
- inherit ( inputs . nixpkgs ) lib cacert symlinkJoin closureInfo runCommandNoCC ;
16
+ inherit ( inputs . nixpkgs ) lib cacert symlinkJoin closureInfo runCommand ;
17
17
18
18
closure = closureInfo {
19
19
rootPaths = { inherit cacert ; } // closureRootPaths ;
20
20
} ;
21
21
22
- global = runCommandNoCC "global" { } ''
22
+ global = runCommand "global" { } ''
23
23
mkdir -p $out $out/etc
24
24
cp ${ closure } /registration $out
25
25
30
30
echo 'nixbld1:!:30001:30000:Nix build user 1:/var/empty:/bin/nologin' >> $out/etc/passwd
31
31
'' ;
32
32
33
- nixConf = runCommandNoCC "nix.conf" { } ''
33
+ nixConf = runCommand "nix.conf" { } ''
34
34
mkdir -p $out/etc/nix
35
35
cat > $out/etc/nix/nix.conf <<'EOF'
36
36
# If /dev/kvm does not actually exist in the container
43
43
EOF
44
44
'' ;
45
45
46
- tmp = runCommandNoCC "tmp" { } ''
46
+ tmp = runCommand "tmp" { } ''
47
47
mkdir -p $out/tmp
48
48
'' ;
49
49
in
You can’t perform that action at this time.
0 commit comments