migrate scion default by khabdrick · Pull Request #715 · ngi-nix/ngipkgs

khabdrick · 2025-04-04T15:43:28Z

Migrate scion default.nix to new project folder.

fixed #590

eljamm · 2025-04-04T16:11:40Z

+  # 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


This is just a not for guidance. Please remove it, @khabdrick

Suggested change

# 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

eljamm · 2025-04-04T16:14:08Z

+      "FooBar"
+      "FooBar-cli"


Search for the project in the NLnet projects page and include the URL handle for the things related to SCION (see triaging template for an example).

eljamm · 2025-04-04T16:14:59Z

+    foobar-cli = null;
+  };
+
+  # NOTE: same structure as programs


This note means that the structure of nixos.modules.program above needs to be copied here, if the project uses services.

eljamm · 2025-04-07T08:10:14Z

@khabdrick The project template has been updated. Is it more clear now?

khabdrick · 2025-04-07T13:19:55Z

@eljamm Heeey!
I'm sorry. I have been ill for the past few days. I am looking at all your input now.

khabdrick · 2025-04-07T14:57:01Z

Made some updates @eljamm

eljamm

Thanks for addressing my comments @khabdrick. Hope you're doing better, now.

eljamm · 2025-04-07T15:19:17Z

+    # examples.foobar = {
+    #   module = ./example.nix;
+    #   description = "";
+    #   tests.basic = ./test.nix;


We can add some basic example and test, here

eljamm · 2025-04-07T15:23:27Z

+    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";
+        };
+      };


I think this might be redundant since they're the same links as nixos.modules.programs. We could just move them to the top-level metadata.links

When I move them, I can delete from both nixos.modules.programs and nixos.modules.services?
@eljamm

khabdrick · 2025-04-07T15:46:13Z

Thanks for addressing my comments @khabdrick. Hope you're doing better, now.

Yes I am, thank you.

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

khabdrick · 2025-04-07T20:29:48Z

I have made the updates.

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

khabdrick · 2025-04-08T08:59:01Z

@eljamm sorry about so many typos. Didn't even realize.
What else is left for this to be completed.

eljamm

What else is left for this to be completed.

The failing tests need to pass. That's why you need to build this locally first, as the task instructs:

$ nix build .#checks.x86_64-linux.projects/SCION/nixos/examples/basic

Also, please run nix fmt when you're done.

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

eljamm · 2025-04-08T13:29:46Z

Please always format the code with nix fmt before you commit.

khabdrick · 2025-04-09T10:56:23Z

Looks like it's okay now? @eljamm

eljamm

Nice! You're very very close to the finish line.

eljamm · 2025-04-09T13:23:16Z

+in
+{
+  options.programs.scion = {
+    enable = lib.mkEnableOption "scion";


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.

khabdrick · 2025-04-09T17:28:24Z

Done

khabdrick · 2025-04-10T07:03:16Z

It seems like these packages are not available.

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

eljamm

Looks good. Congrats @khabdrick!

migrate scion default

10dc5f8

github-project-automation Bot added this to Nix@NGI Apr 4, 2025

eljamm reviewed Apr 4, 2025

View reviewed changes

Merge remote-tracking branch 'origin/main' into migrate-scion

6d58ea9

added projects and links

7cdd0f3

removes unnecessary comment

d5dd134

eljamm reviewed Apr 7, 2025

View reviewed changes

khabdrick and others added 7 commits April 7, 2025 16:48

Update projects/SCION/default.nix

a950e9f

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Update projects/SCION/default.nix

313dcc5

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Update projects/SCION/default.nix

9cee2e4

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Update projects/SCION/default.nix

b0b2552

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Update projects/SCION/default.nix

6ebeb7b

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

add program examples and test

4f170b0

rearrange links

7b348fe

eljamm reviewed Apr 8, 2025

View reviewed changes

Comment thread projects/SCION/default.nix Outdated

khabdrick and others added 7 commits April 8, 2025 09:51

Update projects/SCION/default.nix

d0896e2

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Update projects/SCION/programs/basic/tests/basic.nix

b60e5dd

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Update projects/SCION/programs/basic/examples/basic.nix

116d86e

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Update projects/SCION/programs/basic/module.nix

81d55d7

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Update projects/SCION/programs/basic/module.nix

4c12566

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Update projects/SCION/programs/basic/tests/basic.nix

3265dc6

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Update projects/SCION/default.nix

b6d6b30

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

eljamm reviewed Apr 8, 2025

View reviewed changes

Comment thread projects/SCION/default.nix

Comment thread projects/SCION/programs/basic/examples/basic.nix Outdated

Comment thread projects/SCION/programs/basic/tests/basic.nix Outdated

khabdrick and others added 3 commits April 8, 2025 11:02

Update projects/SCION/default.nix

76dc302

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Update projects/SCION/programs/basic/examples/basic.nix

a1f6a23

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Update projects/SCION/programs/basic/tests/basic.nix

95d2661

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

eljamm reviewed Apr 8, 2025

View reviewed changes

Comment thread projects/SCION/programs/basic/tests/basic.nix Outdated

Update projects/SCION/programs/basic/tests/basic.nix

e7bd05f

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

Formatted SCION default.nix

aafe4fe

eljamm reviewed Apr 9, 2025

View reviewed changes

khabdrick added 2 commits April 9, 2025 18:16

Merge remote-tracking branch 'origin/main' into migrate-scion

7e74e7c

added packages to scion

36132e2

eljamm reviewed Apr 10, 2025

View reviewed changes

Comment thread projects/SCION/programs/basic/module.nix Outdated

khabdrick and others added 2 commits April 10, 2025 08:11

Update projects/SCION/programs/basic/module.nix

4935e66

Co-authored-by: Fedi Jamoussi <Fedi.Jamoussi@protonmail.ch>

SCION: add comment about test

f52491e

eljamm approved these changes Apr 10, 2025

View reviewed changes

eljamm merged commit 51793ff into ngi-nix:main Apr 10, 2025
2 checks passed

github-project-automation Bot moved this to Done in Nix@NGI Apr 10, 2025

themadbit pushed a commit to themadbit/ngipkgs that referenced this pull request Apr 10, 2025

SCION: projects-old -> projects (ngi-nix#715)

c03b4a5

OluchiTheAnalyst pushed a commit to OluchiTheAnalyst/ngipkgs that referenced this pull request Apr 10, 2025

SCION: projects-old -> projects (ngi-nix#715)

06fdc4c

eljamm mentioned this pull request Nov 10, 2025

chore: Update CHANGELOG.md eljamm/ngipkgs#639

Closed

ngi-nix-bot mentioned this pull request Nov 11, 2025

chore: Update CHANGELOG.md #1786

Merged

ngi-nix-bot mentioned this pull request Dec 1, 2025

chore: Update CHANGELOG.md #1861

Merged

ngi-nix-bot mentioned this pull request Mar 1, 2026

chore: Update CHANGELOG.md #2226

Open

Conversation

khabdrick commented Apr 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

eljamm Apr 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

eljamm Apr 4, 2025

Choose a reason for hiding this comment

Uh oh!

eljamm Apr 4, 2025

Choose a reason for hiding this comment

Uh oh!

eljamm commented Apr 7, 2025

Uh oh!

khabdrick commented Apr 7, 2025

Uh oh!

khabdrick commented Apr 7, 2025

Uh oh!

eljamm left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

eljamm Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

eljamm Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

khabdrick Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

eljamm Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

khabdrick commented Apr 7, 2025

Uh oh!

khabdrick commented Apr 7, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

khabdrick commented Apr 8, 2025

Uh oh!

eljamm left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

eljamm commented Apr 8, 2025

Uh oh!

khabdrick commented Apr 9, 2025

Uh oh!

eljamm left a comment

Choose a reason for hiding this comment

Uh oh!

eljamm Apr 9, 2025

Choose a reason for hiding this comment

Uh oh!

khabdrick commented Apr 9, 2025

Uh oh!

khabdrick commented Apr 10, 2025

Uh oh!

Uh oh!

eljamm left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

khabdrick commented Apr 4, 2025 •

edited

Loading

eljamm Apr 4, 2025 •

edited

Loading

eljamm left a comment •

edited

Loading