Skip to content

Commit f71e3e7

Browse files
committed
update std
build direnv lib from std instead of downloading it
1 parent a463136 commit f71e3e7

File tree

5 files changed

+152
-26
lines changed

5 files changed

+152
-26
lines changed

.envrc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
[ -f .envrc.local ] && source_env .envrc.local
55
DEVSHELL_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)"
109
use std nix "//automation/devshells:${DEVSHELL_TARGET}"

flake.lock

Lines changed: 143 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
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")

nix/cloud/hydrationProfile.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ in {
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
@@ -233,7 +233,7 @@ in {
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

nix/cloud/library.nix

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
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
@@ -30,7 +30,7 @@
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
@@ -43,7 +43,7 @@
4343
EOF
4444
'';
4545

46-
tmp = runCommandNoCC "tmp" {} ''
46+
tmp = runCommand "tmp" {} ''
4747
mkdir -p $out/tmp
4848
'';
4949
in

0 commit comments

Comments
 (0)