From 10dc5f8b7ebae4212f4fa79da56529c14d59500c Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Fri, 4 Apr 2025 16:41:50 +0100 Subject: [PATCH 01/25] migrate scion default --- projects/SCION/default.nix | 48 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 projects/SCION/default.nix diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix new file mode 100644 index 000000000..fd102d6c4 --- /dev/null +++ b/projects/SCION/default.nix @@ -0,0 +1,48 @@ +{ + lib, + pkgs, + sources, +}@args: +{ + # NOTE: + # - Check `projects/models.nix` for a more detailed project structure + # - Each program/service must have at least one example + # - Set attributes to `null` to indicate that they're needed, but not available + metadata = { + summary = ""; + subgrants = [ + "FooBar" + "FooBar-cli" + ]; + }; + + nixos.modules.programs = { + foobar = { + name = "foobar"; + module = ./module.nix; + examples.foobar = { + module = ./example.nix; + description = ""; + tests.basic = ./test.nix; + }; + links = { + build = { + text = "FooBar Documentation"; + url = "https://foo.bar/build"; + }; + test = { + text = "FooBar Documentation"; + url = "https://foo.bar/test"; + }; + }; + }; + + # needed, but not available + foobar-cli = null; + }; + + # NOTE: same structure as programs + nixos.modules.services = { + module = "${sources.inputs.nixpkgs}/nixos/modules/services/networking/scion/scion.nix"; + }; +} From 7cdd0f3afcc9ea7b928b908db7cc4c602fd271d6 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Mon, 7 Apr 2025 15:56:01 +0100 Subject: [PATCH 02/25] added projects and links --- projects/SCION/default.nix | 58 ++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index fd102d6c4..a8d311e72 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -9,40 +9,62 @@ # - Each program/service must have at least one example # - Set attributes to `null` to indicate that they're needed, but not available metadata = { - summary = ""; + summary = "SCION is a clean-slate Next-Generation Internet (NGI) architecture which offers a.o. multi-path and path-awareness capabilities by design."; subgrants = [ - "FooBar" - "FooBar-cli" + "SCION-proxy" + "SCION-router-codealignment" + "Verified-SCION-router" + "SCION-Rains" + "SCION-Swarm" + "SCION-IPFS" + "SCION-1M" ]; }; nixos.modules.programs = { - foobar = { - name = "foobar"; - module = ./module.nix; - examples.foobar = { - module = ./example.nix; - description = ""; - tests.basic = ./test.nix; + scion = { + name = "scion"; + # module = ./module.nix; + # examples.foobar = { + # module = ./example.nix; + # description = ""; + # tests.basic = ./test.nix; }; links = { build = { - text = "FooBar Documentation"; - url = "https://foo.bar/build"; + text = "SCION Documentation"; + url = "https://docs.scion.org/en/latest/"; }; - test = { - text = "FooBar Documentation"; - url = "https://foo.bar/test"; + 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"; }; }; }; - # needed, but not available - foobar-cli = null; }; # NOTE: same structure as programs nixos.modules.services = { - module = "${sources.inputs.nixpkgs}/nixos/modules/services/networking/scion/scion.nix"; + name = "service name"; + # module = "./services/scion/module.nix"; + links = { + build = { + 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"; + }; + }; }; } From d5dd13430769912fcdec38c75fb3226a2a469091 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Mon, 7 Apr 2025 16:11:07 +0100 Subject: [PATCH 03/25] removes unnecessary comment --- projects/SCION/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index a8d311e72..f2362ff90 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -4,10 +4,6 @@ sources, }@args: { - # NOTE: - # - Check `projects/models.nix` for a more detailed project structure - # - Each program/service must have at least one example - # - Set attributes to `null` to indicate that they're needed, but not available 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 = [ From a950e9fdd8f53f961df47a56ebdde90a168799d1 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Mon, 7 Apr 2025 16:48:52 +0100 Subject: [PATCH 04/25] Update projects/SCION/default.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index f2362ff90..4afdd4687 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -20,7 +20,7 @@ nixos.modules.programs = { scion = { name = "scion"; - # module = ./module.nix; + module = ./programs/module.nix; # examples.foobar = { # module = ./example.nix; # description = ""; From 313dcc5b85f2af890a64594c2e27d4f8f111b04e Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Mon, 7 Apr 2025 16:49:38 +0100 Subject: [PATCH 05/25] Update projects/SCION/default.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index 4afdd4687..7d50ea2a0 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -27,7 +27,7 @@ # tests.basic = ./test.nix; }; links = { - build = { + docs = { text = "SCION Documentation"; url = "https://docs.scion.org/en/latest/"; }; From 9cee2e498659cf37d8faf2973b3de995a31c4ae5 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Mon, 7 Apr 2025 16:49:58 +0100 Subject: [PATCH 06/25] Update projects/SCION/default.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index 7d50ea2a0..ce1eeb83f 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -44,7 +44,6 @@ }; - # NOTE: same structure as programs nixos.modules.services = { name = "service name"; # module = "./services/scion/module.nix"; From b0b255248a62db804f6a8c38fdf0588e6824fd84 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Mon, 7 Apr 2025 16:50:32 +0100 Subject: [PATCH 07/25] Update projects/SCION/default.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index ce1eeb83f..1be94547d 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -46,7 +46,7 @@ nixos.modules.services = { name = "service name"; - # module = "./services/scion/module.nix"; + module = "${sources.inputs.nixpkgs}/nixos/modules/services/networking/scion/scion.nix"; links = { build = { text = "SCION Documentation"; From 6ebeb7bafd9ac3a1eb3c8026224e15327a683771 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Mon, 7 Apr 2025 16:50:54 +0100 Subject: [PATCH 08/25] Update projects/SCION/default.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index 1be94547d..2fb9d9fbc 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -14,6 +14,7 @@ "SCION-Swarm" "SCION-IPFS" "SCION-1M" + "SCION-geo" ]; }; From 4f170b0d7c38eb2397ee477e70fe441c4243133c Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Mon, 7 Apr 2025 21:13:41 +0100 Subject: [PATCH 09/25] add program examples and test --- projects/SCION/default.nix | 26 ++++------------- .../SCION/programs/basic/examples/basic.nix | 5 ++++ projects/SCION/programs/basic/module.nix | 14 ++++++++++ projects/SCION/programs/basic/tests/basic.nix | 28 +++++++++++++++++++ 4 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 projects/SCION/programs/basic/examples/basic.nix create mode 100644 projects/SCION/programs/basic/module.nix create mode 100644 projects/SCION/programs/basic/tests/basic.nix diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index 2fb9d9fbc..9979a106a 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -21,11 +21,11 @@ nixos.modules.programs = { scion = { name = "scion"; - module = ./programs/module.nix; - # examples.foobar = { - # module = ./example.nix; - # description = ""; - # tests.basic = ./test.nix; + module = ./programs/basic/module.nix; + examples.basic = { + module = ./programs/basic/examples/basic.nix; + description = ""; + tests.basic = ./programs/basic/tests/basic.nix; }; links = { docs = { @@ -47,20 +47,6 @@ nixos.modules.services = { name = "service name"; - module = "${sources.inputs.nixpkgs}/nixos/modules/services/networking/scion/scion.nix"; - links = { - build = { - 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"; - }; - }; + module = "${sources.inputs.nixpkgs}/nixos/modules/services/networking/scion/scion.nix"; }; } diff --git a/projects/SCION/programs/basic/examples/basic.nix b/projects/SCION/programs/basic/examples/basic.nix new file mode 100644 index 000000000..abf78fcae --- /dev/null +++ b/projects/SCION/programs/basic/examples/basic.nix @@ -0,0 +1,5 @@ +{ ... }: + +{ + services.scoin.enable = true; +} diff --git a/projects/SCION/programs/basic/module.nix b/projects/SCION/programs/basic/module.nix new file mode 100644 index 000000000..3f0cfa8fb --- /dev/null +++ b/projects/SCION/programs/basic/module.nix @@ -0,0 +1,14 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.basic; +in +{ + options.programs.basic = { + enable = lib.mkEnableOption "scoin"; + }; +} diff --git a/projects/SCION/programs/basic/tests/basic.nix b/projects/SCION/programs/basic/tests/basic.nix new file mode 100644 index 000000000..52fe2ebbb --- /dev/null +++ b/projects/SCION/programs/basic/tests/basic.nix @@ -0,0 +1,28 @@ +{ + sources, + ... +}: + +{ + name = "scoin"; + + nodes = { + machine = + { ... }: + { + imports = [ + sources.modules.ngipkgs + sources.modules.services.scoin + sources.examples.SCOIN.scoin + ]; + }; + }; + + testScript = + { nodes, ... }: + '' + start_all() + + machine.succeed() + ''; +} From 7b348fe51aad0210adb3878ec018e52b9dd3403f Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Mon, 7 Apr 2025 21:29:03 +0100 Subject: [PATCH 10/25] rearrange links --- projects/SCION/default.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index 9979a106a..652c61a63 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -16,18 +16,7 @@ "SCION-1M" "SCION-geo" ]; - }; - - nixos.modules.programs = { - scion = { - name = "scion"; - module = ./programs/basic/module.nix; - examples.basic = { - module = ./programs/basic/examples/basic.nix; - description = ""; - tests.basic = ./programs/basic/tests/basic.nix; - }; - links = { + links = { docs = { text = "SCION Documentation"; url = "https://docs.scion.org/en/latest/"; @@ -41,6 +30,18 @@ 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 = ./programs/basic/tests/basic.nix; + }; + }; }; From d0896e2c0f89225448d2e92f565e1a4d3bc21b28 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Tue, 8 Apr 2025 09:51:44 +0100 Subject: [PATCH 11/25] Update projects/SCION/default.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index 652c61a63..091a04a9e 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -39,7 +39,7 @@ examples.basic = { module = ./programs/basic/examples/basic.nix; description = ""; - tests.basic = ./programs/basic/tests/basic.nix; + tests.basic = import ./programs/basic/tests/basic.nix args; }; }; From b60e5dd0846a59bd53ef2a8f5cd9e9ae4553dee5 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Tue, 8 Apr 2025 09:52:22 +0100 Subject: [PATCH 12/25] Update projects/SCION/programs/basic/tests/basic.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/programs/basic/tests/basic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SCION/programs/basic/tests/basic.nix b/projects/SCION/programs/basic/tests/basic.nix index 52fe2ebbb..44b862609 100644 --- a/projects/SCION/programs/basic/tests/basic.nix +++ b/projects/SCION/programs/basic/tests/basic.nix @@ -4,7 +4,7 @@ }: { - name = "scoin"; + name = "scion"; nodes = { machine = From 116d86e70fdfbf8c78658ea463202b76b9313f25 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Tue, 8 Apr 2025 09:53:06 +0100 Subject: [PATCH 13/25] Update projects/SCION/programs/basic/examples/basic.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/programs/basic/examples/basic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SCION/programs/basic/examples/basic.nix b/projects/SCION/programs/basic/examples/basic.nix index abf78fcae..ca4796bc1 100644 --- a/projects/SCION/programs/basic/examples/basic.nix +++ b/projects/SCION/programs/basic/examples/basic.nix @@ -1,5 +1,5 @@ { ... }: { - services.scoin.enable = true; + services.scion.enable = true; } From 81d55d769001c3c9d0da47b80bbdb4fc7f6c8fa3 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Tue, 8 Apr 2025 09:53:56 +0100 Subject: [PATCH 14/25] Update projects/SCION/programs/basic/module.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/programs/basic/module.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/SCION/programs/basic/module.nix b/projects/SCION/programs/basic/module.nix index 3f0cfa8fb..90aa040fd 100644 --- a/projects/SCION/programs/basic/module.nix +++ b/projects/SCION/programs/basic/module.nix @@ -8,7 +8,7 @@ let cfg = config.programs.basic; in { - options.programs.basic = { - enable = lib.mkEnableOption "scoin"; + options.programs.scion = { + enable = lib.mkEnableOption "scion"; }; } From 4c125666e4cf81551540b42629bcd48ec965f7ca Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Tue, 8 Apr 2025 09:56:37 +0100 Subject: [PATCH 15/25] Update projects/SCION/programs/basic/module.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/programs/basic/module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SCION/programs/basic/module.nix b/projects/SCION/programs/basic/module.nix index 90aa040fd..f0d9aa66b 100644 --- a/projects/SCION/programs/basic/module.nix +++ b/projects/SCION/programs/basic/module.nix @@ -5,7 +5,7 @@ ... }: let - cfg = config.programs.basic; + cfg = config.programs.scion; in { options.programs.scion = { From 3265dc6821bf597cc71f7d1918238273a3621e17 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Tue, 8 Apr 2025 09:56:54 +0100 Subject: [PATCH 16/25] Update projects/SCION/programs/basic/tests/basic.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/programs/basic/tests/basic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/SCION/programs/basic/tests/basic.nix b/projects/SCION/programs/basic/tests/basic.nix index 44b862609..353a542bc 100644 --- a/projects/SCION/programs/basic/tests/basic.nix +++ b/projects/SCION/programs/basic/tests/basic.nix @@ -12,8 +12,8 @@ { imports = [ sources.modules.ngipkgs - sources.modules.services.scoin - sources.examples.SCOIN.scoin + sources.modules.services.scion + sources.examples.SCION.scion ]; }; }; From b6d6b30a2603b8babff7854a9642547c222987c8 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Tue, 8 Apr 2025 09:57:23 +0100 Subject: [PATCH 17/25] Update projects/SCION/default.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index 091a04a9e..b0db9ea22 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -41,9 +41,7 @@ description = ""; tests.basic = import ./programs/basic/tests/basic.nix args; }; - }; - }; nixos.modules.services = { From 76dc3026bc566347641d120ad1c2d134f48ef694 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Tue, 8 Apr 2025 11:02:43 +0100 Subject: [PATCH 18/25] Update projects/SCION/default.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index b0db9ea22..a047e048d 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -45,7 +45,10 @@ }; nixos.modules.services = { - name = "service name"; - module = "${sources.inputs.nixpkgs}/nixos/modules/services/networking/scion/scion.nix"; + scion = { + name = "scion"; + module = "${sources.inputs.nixpkgs}/nixos/modules/services/networking/scion/scion.nix"; + examples.basic = null; + }; }; } From a1f6a2341809cb7f28d94fdf060cd38065a49de1 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Tue, 8 Apr 2025 11:03:08 +0100 Subject: [PATCH 19/25] Update projects/SCION/programs/basic/examples/basic.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/programs/basic/examples/basic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SCION/programs/basic/examples/basic.nix b/projects/SCION/programs/basic/examples/basic.nix index ca4796bc1..e90d7d82c 100644 --- a/projects/SCION/programs/basic/examples/basic.nix +++ b/projects/SCION/programs/basic/examples/basic.nix @@ -1,5 +1,5 @@ { ... }: { - services.scion.enable = true; + programs.scion.enable = true; } From 95d2661815e8570d72b83aaf8d6d718c50c88c7f Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Tue, 8 Apr 2025 11:03:53 +0100 Subject: [PATCH 20/25] Update projects/SCION/programs/basic/tests/basic.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/programs/basic/tests/basic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SCION/programs/basic/tests/basic.nix b/projects/SCION/programs/basic/tests/basic.nix index 353a542bc..680474d13 100644 --- a/projects/SCION/programs/basic/tests/basic.nix +++ b/projects/SCION/programs/basic/tests/basic.nix @@ -12,7 +12,7 @@ { imports = [ sources.modules.ngipkgs - sources.modules.services.scion + sources.modules.programs.scion sources.examples.SCION.scion ]; }; From e7bd05f232da52248277d11f21d3b34c376a4a01 Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Tue, 8 Apr 2025 14:25:56 +0100 Subject: [PATCH 21/25] Update projects/SCION/programs/basic/tests/basic.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/programs/basic/tests/basic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SCION/programs/basic/tests/basic.nix b/projects/SCION/programs/basic/tests/basic.nix index 680474d13..0b024900f 100644 --- a/projects/SCION/programs/basic/tests/basic.nix +++ b/projects/SCION/programs/basic/tests/basic.nix @@ -13,7 +13,7 @@ imports = [ sources.modules.ngipkgs sources.modules.programs.scion - sources.examples.SCION.scion + sources.examples.SCION.basic ]; }; }; From aafe4feddd18909ba49685cda73f37250c67074d Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Wed, 9 Apr 2025 11:53:18 +0100 Subject: [PATCH 22/25] Formatted SCION default.nix --- projects/SCION/default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index a047e048d..0695062fe 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -17,19 +17,19 @@ "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"; - }; + 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 = { From 36132e2b9887925534fd08e0a14531de3a2cb62a Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Wed, 9 Apr 2025 18:22:32 +0100 Subject: [PATCH 23/25] added packages to scion --- projects-old/SCION-1M/default.nix | 23 ----------------------- projects/SCION/programs/basic/module.nix | 10 ++++++++++ 2 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 projects-old/SCION-1M/default.nix diff --git a/projects-old/SCION-1M/default.nix b/projects-old/SCION-1M/default.nix deleted file mode 100644 index 3911adf2f..000000000 --- a/projects-old/SCION-1M/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - pkgs, - lib, - sources, -}@args: -{ - packages = { - inherit (pkgs) - scion - scion-apps - scion-bootstrapper - ioq3-scion - pan-bindings - ; - }; - nixos = { - modules.services.scion = "${sources.inputs.nixpkgs}/nixos/modules/services/networking/scion/scion.nix"; - # TODO: unbreak - # tests.scion = "${sources.inputs.nixpkgs}/nixos/tests/scion/freestanding-deployment/default.nix"; - tests = null; - examples = null; - }; -} diff --git a/projects/SCION/programs/basic/module.nix b/projects/SCION/programs/basic/module.nix index f0d9aa66b..30b54688b 100644 --- a/projects/SCION/programs/basic/module.nix +++ b/projects/SCION/programs/basic/module.nix @@ -11,4 +11,14 @@ in options.programs.scion = { enable = lib.mkEnableOption "scion"; }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + scion + scion-apps + scion-bootstrapper + ioq3-scion + pan-bindings + ]; + }; } From 4935e66e0f38be3d6c8f8f249d157321c4701b7e Mon Sep 17 00:00:00 2001 From: Muhammed Ali Date: Thu, 10 Apr 2025 08:11:42 +0100 Subject: [PATCH 24/25] Update projects/SCION/programs/basic/module.nix Co-authored-by: Fedi Jamoussi --- projects/SCION/programs/basic/module.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/SCION/programs/basic/module.nix b/projects/SCION/programs/basic/module.nix index 30b54688b..1cef7462c 100644 --- a/projects/SCION/programs/basic/module.nix +++ b/projects/SCION/programs/basic/module.nix @@ -16,7 +16,7 @@ in environment.systemPackages = with pkgs; [ scion scion-apps - scion-bootstrapper + # scion-bootstrapper # FIX: broken in nixpkgs ioq3-scion pan-bindings ]; From f52491e53ad415357b04a48f99c8cf810a919e90 Mon Sep 17 00:00:00 2001 From: eljamm Date: Thu, 10 Apr 2025 09:34:58 +0200 Subject: [PATCH 25/25] SCION: add comment about test --- projects/SCION/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/SCION/default.nix b/projects/SCION/default.nix index 0695062fe..b956be154 100644 --- a/projects/SCION/default.nix +++ b/projects/SCION/default.nix @@ -48,7 +48,8 @@ scion = { name = "scion"; module = "${sources.inputs.nixpkgs}/nixos/modules/services/networking/scion/scion.nix"; - examples.basic = null; + # TODO: unbreak + # tests.scion = "${sources.inputs.nixpkgs}/nixos/tests/scion/freestanding-deployment/default.nix"; }; }; }