Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
10dc5f8
migrate scion default
khabdrick Apr 4, 2025
6d58ea9
Merge remote-tracking branch 'origin/main' into migrate-scion
khabdrick Apr 7, 2025
7cdd0f3
added projects and links
khabdrick Apr 7, 2025
d5dd134
removes unnecessary comment
khabdrick Apr 7, 2025
a950e9f
Update projects/SCION/default.nix
khabdrick Apr 7, 2025
313dcc5
Update projects/SCION/default.nix
khabdrick Apr 7, 2025
9cee2e4
Update projects/SCION/default.nix
khabdrick Apr 7, 2025
b0b2552
Update projects/SCION/default.nix
khabdrick Apr 7, 2025
6ebeb7b
Update projects/SCION/default.nix
khabdrick Apr 7, 2025
4f170b0
add program examples and test
khabdrick Apr 7, 2025
7b348fe
rearrange links
khabdrick Apr 7, 2025
d0896e2
Update projects/SCION/default.nix
khabdrick Apr 8, 2025
b60e5dd
Update projects/SCION/programs/basic/tests/basic.nix
khabdrick Apr 8, 2025
116d86e
Update projects/SCION/programs/basic/examples/basic.nix
khabdrick Apr 8, 2025
81d55d7
Update projects/SCION/programs/basic/module.nix
khabdrick Apr 8, 2025
4c12566
Update projects/SCION/programs/basic/module.nix
khabdrick Apr 8, 2025
3265dc6
Update projects/SCION/programs/basic/tests/basic.nix
khabdrick Apr 8, 2025
b6d6b30
Update projects/SCION/default.nix
khabdrick Apr 8, 2025
76dc302
Update projects/SCION/default.nix
khabdrick Apr 8, 2025
a1f6a23
Update projects/SCION/programs/basic/examples/basic.nix
khabdrick Apr 8, 2025
95d2661
Update projects/SCION/programs/basic/tests/basic.nix
khabdrick Apr 8, 2025
e7bd05f
Update projects/SCION/programs/basic/tests/basic.nix
khabdrick Apr 8, 2025
aafe4fe
Formatted SCION default.nix
khabdrick Apr 9, 2025
7e74e7c
Merge remote-tracking branch 'origin/main' into migrate-scion
khabdrick Apr 9, 2025
36132e2
added packages to scion
khabdrick Apr 9, 2025
4935e66
Update projects/SCION/programs/basic/module.nix
khabdrick Apr 10, 2025
f52491e
SCION: add comment about test
eljamm Apr 10, 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
23 changes: 0 additions & 23 deletions projects-old/SCION-1M/default.nix

This file was deleted.

55 changes: 55 additions & 0 deletions projects/SCION/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
lib,
pkgs,
sources,
}@args:
{
metadata = {
summary = "SCION is a clean-slate Next-Generation Internet (NGI) architecture which offers a.o. multi-path and path-awareness capabilities by design.";
subgrants = [
"SCION-proxy"
"SCION-router-codealignment"
"Verified-SCION-router"
"SCION-Rains"
"SCION-Swarm"
"SCION-IPFS"
"SCION-1M"
"SCION-geo"
];
Comment thread
khabdrick marked this conversation as resolved.
links = {
docs = {
text = "SCION Documentation";
url = "https://docs.scion.org/en/latest/";
};
build = {
text = "Build from source";
url = "https://github.com/scionproto/scion?tab=readme-ov-file#build-from-sources";
};
tests = {
text = "Testing Tutorial";
url = "https://docs.scion.org/en/latest/tutorials/deploy.html#tasks-to-perform";
};
};
};

nixos.modules.programs = {
scion = {
name = "scion";
module = ./programs/basic/module.nix;
examples.basic = {
module = ./programs/basic/examples/basic.nix;
description = "";
tests.basic = import ./programs/basic/tests/basic.nix args;
};
};
};

nixos.modules.services = {
scion = {
name = "scion";
module = "${sources.inputs.nixpkgs}/nixos/modules/services/networking/scion/scion.nix";
# TODO: unbreak
# tests.scion = "${sources.inputs.nixpkgs}/nixos/tests/scion/freestanding-deployment/default.nix";
};
};
}
5 changes: 5 additions & 0 deletions projects/SCION/programs/basic/examples/basic.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{ ... }:

{
programs.scion.enable = true;
}
24 changes: 24 additions & 0 deletions projects/SCION/programs/basic/module.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.programs.scion;
in
{
options.programs.scion = {
enable = lib.mkEnableOption "scion";
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Can you follow the new template and add packages from projects-old/SCION-1M here? After you finish, delete that directory and commit your changes.

};

config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
scion
scion-apps
# scion-bootstrapper # FIX: broken in nixpkgs
ioq3-scion
pan-bindings
];
};
}
28 changes: 28 additions & 0 deletions projects/SCION/programs/basic/tests/basic.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
sources,
...
}:

{
name = "scion";

nodes = {
machine =
{ ... }:
{
imports = [
sources.modules.ngipkgs
sources.modules.programs.scion
sources.examples.SCION.basic
];
};
};

testScript =
{ nodes, ... }:
''
start_all()

machine.succeed()
'';
}