Skip to content

overview: use NIX_CONFIG from CI tests #1017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fricklerhandwerk wants to merge 17 commits into
base: main
Choose a base branch
from
Open

overview: use NIX_CONFIG from CI tests #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
f3bfe45
overview: use extra- in NIX_CONFIG
fricklerhandwerk May 15, 2025
9c1b1d6
CI: move NIX_CONFIG into workflow YAML
fricklerhandwerk May 15, 2025
e16a33d
use NIX_CONFIG from CI workflow
fricklerhandwerk May 15, 2025
e05237a
export inline
fricklerhandwerk May 15, 2025
d917254
overview: use extra- in NIX_CONFIG
fricklerhandwerk May 15, 2025
b38412c
use NIX_CONFIG from CI workflow
fricklerhandwerk May 15, 2025
6e30d04
export inline
fricklerhandwerk May 15, 2025
57fb3c0
shell code content types
fricklerhandwerk Jun 4, 2025
54aa748
install instructions type
fricklerhandwerk Jun 4, 2025
a271502
render it
fricklerhandwerk Jun 4, 2025
0fc5964
fix presentation
fricklerhandwerk Jun 4, 2025
c351300
Merge branch 'main' into install-instuctions-module
fricklerhandwerk Jun 9, 2025
562e0c0
refactor for sanity
fricklerhandwerk Jun 9, 2025
126d6bc
Merge branch 'install-instuctions-module' into simplify-caching
fricklerhandwerk Jun 9, 2025
7fc729d
use shell command rendering code
fricklerhandwerk Jun 9, 2025
39e22fb
Merge branch 'simplify-caching' of github.com:fricklerhandwerk/ngipkg…
fricklerhandwerk Jun 9, 2025
4d08d82
Merge branch 'main' into simplify-caching
fricklerhandwerk Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions overview/content-types/config-item.nix
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions overview/content-types/nix-config.nix
View file
Open in desktop

This file was deleted.

45 changes: 20 additions & 25 deletions overview/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,31 +300,26 @@ let
}
];
};
nix-config = eval {
imports = [ ./content-types/nix-config.nix ];
settings = [
{
name = "substituters";
value = [
"https://cache.nixos.org/"
"https://ngi.cachix.org/"
];
}
{
name = "trusted-public-keys";
value = [
"cache.nixos.org-1:6nchdd59x431o0gwypbmraurkbj16zpmqfgspcdshjy="
"ngi.cachix.org-1:n+cal72roc3qqulxihpv+tw5t42whxmmhpragkrsrow="
];
}
];
};
set-nix-config = eval {
imports = [ ./content-types/commands.nix ];
instructions.commands.bash.input = ''
export ${nix-config}
'';
};
set-nix-config =
let
from-yaml =
file:
with builtins;
fromJSON (
# XXX(@fricklerhandwerk): IFD, sorry. I was there, Gandalf: https://github.com/NixOS/nix/pull/7340
readFile (pkgs.runCommandNoCC "yaml.json" { } "${lib.getExe pkgs.yj} < ${file} > $out")
);
workflow = from-yaml ../.github/workflows/test-demo.yaml;
nix-config = with lib; trim (elemAt workflow.jobs.test.steps 3).env.NIX_CONFIG;
Copy link
Copy Markdown
Contributor Author

@fricklerhandwerk fricklerhandwerk Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We may want to have some assertion here that the string starts with extra- or something, such that changing the order of entries won't have surprising effects on the overview.

in
eval {
imports = [ ./content-types/commands.nix ];
instructions.commands.bash.input = ''
export NIX_CONFIG="
${nix-config}
"
'';
};
in
''
${heading 2 "demo" (
Expand Down