From b1b384ccb3b0c263ab7d1c0e692524733cefc889 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Wed, 18 Jun 2025 09:24:15 +0100
Subject: [PATCH 1/2] nixos/scion: changes for 0.12

These are the necessary changes for updating to 0.12, which supports dispatcherless operation by foregoing the dispatcher's unix socket in favour of UDP
---
 nixos/modules/services/networking/scion/scion-control.nix    | 1 -
 nixos/modules/services/networking/scion/scion-daemon.nix     | 1 -
 nixos/modules/services/networking/scion/scion-dispatcher.nix | 3 +--
 nixos/tests/scion/freestanding-deployment/topology1.json     | 1 +
 nixos/tests/scion/freestanding-deployment/topology2.json     | 1 +
 nixos/tests/scion/freestanding-deployment/topology3.json     | 1 +
 nixos/tests/scion/freestanding-deployment/topology4.json     | 1 +
 nixos/tests/scion/freestanding-deployment/topology5.json     | 1 +
 8 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/scion/scion-control.nix b/nixos/modules/services/networking/scion/scion-control.nix
index f0550f32cb1f..316b6ba67885 100644
--- a/nixos/modules/services/networking/scion/scion-control.nix
+++ b/nixos/modules/services/networking/scion/scion-control.nix
@@ -16,7 +16,6 @@ let
     general = {
       id = "cs";
       config_dir = "/etc/scion";
-      reconnect_to_dispatcher = true;
     };
     beacon_db = {
       connection = "${connectionDir}/scion-control/control.beacon.db";
diff --git a/nixos/modules/services/networking/scion/scion-daemon.nix b/nixos/modules/services/networking/scion/scion-daemon.nix
index 36bd78bf5665..cad896986a3d 100644
--- a/nixos/modules/services/networking/scion/scion-daemon.nix
+++ b/nixos/modules/services/networking/scion/scion-daemon.nix
@@ -16,7 +16,6 @@ let
     general = {
       id = "sd";
       config_dir = "/etc/scion";
-      reconnect_to_dispatcher = true;
     };
     path_db = {
       connection = "${connectionDir}/scion-daemon/sd.path.db";
diff --git a/nixos/modules/services/networking/scion/scion-dispatcher.nix b/nixos/modules/services/networking/scion/scion-dispatcher.nix
index a6559487a19b..f10c04ab37f5 100644
--- a/nixos/modules/services/networking/scion/scion-dispatcher.nix
+++ b/nixos/modules/services/networking/scion/scion-dispatcher.nix
@@ -14,8 +14,7 @@ let
   defaultConfig = {
     dispatcher = {
       id = "dispatcher";
-      socket_file_mode = "0770";
-      application_socket = "/dev/shm/dispatcher/default.sock";
+      local_udp_forwarding = true;
     };
     log.console = {
       level = "info";
diff --git a/nixos/tests/scion/freestanding-deployment/topology1.json b/nixos/tests/scion/freestanding-deployment/topology1.json
index de51515eebc2..9494121421a0 100644
--- a/nixos/tests/scion/freestanding-deployment/topology1.json
+++ b/nixos/tests/scion/freestanding-deployment/topology1.json
@@ -1,4 +1,5 @@
 {
+  "dispatched_ports": "31000-32767",
   "attributes": [
     "core"
   ],
diff --git a/nixos/tests/scion/freestanding-deployment/topology2.json b/nixos/tests/scion/freestanding-deployment/topology2.json
index f8e10d5d1f75..d576ea6ed307 100644
--- a/nixos/tests/scion/freestanding-deployment/topology2.json
+++ b/nixos/tests/scion/freestanding-deployment/topology2.json
@@ -1,4 +1,5 @@
 {
+  "dispatched_ports": "31000-32767",
   "attributes": [
     "core"
   ],
diff --git a/nixos/tests/scion/freestanding-deployment/topology3.json b/nixos/tests/scion/freestanding-deployment/topology3.json
index 53cee431885b..8f9a8bd260a9 100644
--- a/nixos/tests/scion/freestanding-deployment/topology3.json
+++ b/nixos/tests/scion/freestanding-deployment/topology3.json
@@ -1,4 +1,5 @@
 {
+  "dispatched_ports": "31000-32767",
   "attributes": [
     "core"
   ],
diff --git a/nixos/tests/scion/freestanding-deployment/topology4.json b/nixos/tests/scion/freestanding-deployment/topology4.json
index 0526c1f1edd6..6dc847b1711d 100644
--- a/nixos/tests/scion/freestanding-deployment/topology4.json
+++ b/nixos/tests/scion/freestanding-deployment/topology4.json
@@ -1,4 +1,5 @@
 {
+  "dispatched_ports": "31000-32767",
   "attributes": [],
   "isd_as": "42-ffaa:1:4",
   "mtu": 1472,
diff --git a/nixos/tests/scion/freestanding-deployment/topology5.json b/nixos/tests/scion/freestanding-deployment/topology5.json
index 1326bd3c2955..8bbb2eac72fc 100644
--- a/nixos/tests/scion/freestanding-deployment/topology5.json
+++ b/nixos/tests/scion/freestanding-deployment/topology5.json
@@ -1,4 +1,5 @@
 {
+  "dispatched_ports": "31000-32767",
   "attributes": [],
   "isd_as": "42-ffaa:1:5",
   "mtu": 1472,

From c3af3e7a2c528cb4ad4f84b47ac65b5ae358e33f Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Wed, 18 Jun 2025 09:24:37 +0100
Subject: [PATCH 2/2] scion: 0.11 -> 0.12

---
 pkgs/by-name/sc/scion/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sc/scion/package.nix b/pkgs/by-name/sc/scion/package.nix
index e06936b59c1c..6fd522c04f8b 100644
--- a/pkgs/by-name/sc/scion/package.nix
+++ b/pkgs/by-name/sc/scion/package.nix
@@ -5,7 +5,7 @@
   nixosTests,
 }:
 let
-  version = "0.11.0";
+  version = "0.12.0";
 in
 
 buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "scionproto";
     repo = "scion";
     rev = "v${version}";
-    hash = "sha256-JemqSr1XBwW1hLuWQrApY/hqLj/VpW3xSJedVIoFSiY=";
+    hash = "sha256-J51GIQQhS623wFUU5dI/TwT2rkDH69518lpdCLZ/iM0=";
   };
 
-  vendorHash = "sha256-akFbHgo8xI2/4aQsyutjhXPM5d0A3se3kG/6Ebw1Qcs=";
+  vendorHash = "sha256-Ew/hQM8uhaM89sCcPKUBbiGukDq3h5x+KID3w/8BDHg=";
 
   excludedPackages = [
     "acceptance"