-
Notifications
You must be signed in to change notification settings - Fork 58
migrate scion default #715
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
10dc5f8
migrate scion default
khabdrick 6d58ea9
Merge remote-tracking branch 'origin/main' into migrate-scion
khabdrick 7cdd0f3
added projects and links
khabdrick d5dd134
removes unnecessary comment
khabdrick a950e9f
Update projects/SCION/default.nix
khabdrick 313dcc5
Update projects/SCION/default.nix
khabdrick 9cee2e4
Update projects/SCION/default.nix
khabdrick b0b2552
Update projects/SCION/default.nix
khabdrick 6ebeb7b
Update projects/SCION/default.nix
khabdrick 4f170b0
add program examples and test
khabdrick 7b348fe
rearrange links
khabdrick d0896e2
Update projects/SCION/default.nix
khabdrick b60e5dd
Update projects/SCION/programs/basic/tests/basic.nix
khabdrick 116d86e
Update projects/SCION/programs/basic/examples/basic.nix
khabdrick 81d55d7
Update projects/SCION/programs/basic/module.nix
khabdrick 4c12566
Update projects/SCION/programs/basic/module.nix
khabdrick 3265dc6
Update projects/SCION/programs/basic/tests/basic.nix
khabdrick b6d6b30
Update projects/SCION/default.nix
khabdrick 76dc302
Update projects/SCION/default.nix
khabdrick a1f6a23
Update projects/SCION/programs/basic/examples/basic.nix
khabdrick 95d2661
Update projects/SCION/programs/basic/tests/basic.nix
khabdrick e7bd05f
Update projects/SCION/programs/basic/tests/basic.nix
khabdrick aafe4fe
Formatted SCION default.nix
khabdrick 7e74e7c
Merge remote-tracking branch 'origin/main' into migrate-scion
khabdrick 36132e2
added packages to scion
khabdrick 4935e66
Update projects/SCION/programs/basic/module.nix
khabdrick f52491e
SCION: add comment about test
eljamm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" | ||
| ]; | ||
| 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"; | ||
| }; | ||
| }; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| { ... }: | ||
|
|
||
| { | ||
| programs.scion.enable = true; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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"; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you follow the new template and add packages from |
||
| }; | ||
|
|
||
| config = lib.mkIf cfg.enable { | ||
| environment.systemPackages = with pkgs; [ | ||
| scion | ||
| scion-apps | ||
| # scion-bootstrapper # FIX: broken in nixpkgs | ||
| ioq3-scion | ||
| pan-bindings | ||
| ]; | ||
| }; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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() | ||
| ''; | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.