commit e9eb7be1d6a90720af3cf416c60f2d17344c08ef · pyrox.dev/nixpkgs

-1

nixos/modules/services/networking/scion/scion-control.nix

···

       16
        
           general = {

     

       17
        
             id = "cs";

     

       18
        
             config_dir = "/etc/scion";

     

       19
       -
             reconnect_to_dispatcher = true;

     

       20
        
           };

     

       21
        
           beacon_db = {

     

       22
        
             connection = "${connectionDir}/scion-control/control.beacon.db";

···

       16
        
           general = {

     

       17
        
             id = "cs";

     

       18
        
             config_dir = "/etc/scion";

     

       0
        
       
     

       19
        
           };

     

       20
        
           beacon_db = {

     

       21
        
             connection = "${connectionDir}/scion-control/control.beacon.db";

-1

nixos/modules/services/networking/scion/scion-daemon.nix

···

       16
        
           general = {

     

       17
        
             id = "sd";

     

       18
        
             config_dir = "/etc/scion";

     

       19
       -
             reconnect_to_dispatcher = true;

     

       20
        
           };

     

       21
        
           path_db = {

     

       22
        
             connection = "${connectionDir}/scion-daemon/sd.path.db";

···

       16
        
           general = {

     

       17
        
             id = "sd";

     

       18
        
             config_dir = "/etc/scion";

     

       0
        
       
     

       19
        
           };

     

       20
        
           path_db = {

     

       21
        
             connection = "${connectionDir}/scion-daemon/sd.path.db";

+1 -2

nixos/modules/services/networking/scion/scion-dispatcher.nix

···

       14
        
         defaultConfig = {

     

       15
        
           dispatcher = {

     

       16
        
             id = "dispatcher";

     

       17
       -
             socket_file_mode = "0770";

     

       18
       -
             application_socket = "/dev/shm/dispatcher/default.sock";

     

       19
        
           };

     

       20
        
           log.console = {

     

       21
        
             level = "info";

···

       14
        
         defaultConfig = {

     

       15
        
           dispatcher = {

     

       16
        
             id = "dispatcher";

     

       17
       +
             local_udp_forwarding = true;

     

       0
        
       
     

       18
        
           };

     

       19
        
           log.console = {

     

       20
        
             level = "info";

+1

nixos/tests/scion/freestanding-deployment/topology1.json

···

       1
        
       {

     

       0
        
       
     

       2
        
         "attributes": [

     

       3
        
           "core"

     

       4
        
         ],

···

       1
        
       {

     

       2
       +
         "dispatched_ports": "31000-32767",

     

       3
        
         "attributes": [

     

       4
        
           "core"

     

       5
        
         ],

+1

nixos/tests/scion/freestanding-deployment/topology2.json

···

       1
        
       {

     

       0
        
       
     

       2
        
         "attributes": [

     

       3
        
           "core"

     

       4
        
         ],

···

       1
        
       {

     

       2
       +
         "dispatched_ports": "31000-32767",

     

       3
        
         "attributes": [

     

       4
        
           "core"

     

       5
        
         ],

+1

nixos/tests/scion/freestanding-deployment/topology3.json

···

       1
        
       {

     

       0
        
       
     

       2
        
         "attributes": [

     

       3
        
           "core"

     

       4
        
         ],

···

       1
        
       {

     

       2
       +
         "dispatched_ports": "31000-32767",

     

       3
        
         "attributes": [

     

       4
        
           "core"

     

       5
        
         ],

+1

nixos/tests/scion/freestanding-deployment/topology4.json

···

       1
        
       {

     

       0
        
       
     

       2
        
         "attributes": [],

     

       3
        
         "isd_as": "42-ffaa:1:4",

     

       4
        
         "mtu": 1472,

···

       1
        
       {

     

       2
       +
         "dispatched_ports": "31000-32767",

     

       3
        
         "attributes": [],

     

       4
        
         "isd_as": "42-ffaa:1:4",

     

       5
        
         "mtu": 1472,

+1

nixos/tests/scion/freestanding-deployment/topology5.json

···

       1
        
       {

     

       0
        
       
     

       2
        
         "attributes": [],

     

       3
        
         "isd_as": "42-ffaa:1:5",

     

       4
        
         "mtu": 1472,

···

       1
        
       {

     

       2
       +
         "dispatched_ports": "31000-32767",

     

       3
        
         "attributes": [],

     

       4
        
         "isd_as": "42-ffaa:1:5",

     

       5
        
         "mtu": 1472,

+3 -3

pkgs/by-name/sc/scion/package.nix

···

       5
        
         nixosTests,

     

       6
        
       }:

     

       7
        
       let

     

       8
       -
         version = "0.11.0";

     

       9
        
       in

     

       10
        
       

     

       11
        
       buildGoModule {

     
···

       17
        
           owner = "scionproto";

     

       18
        
           repo = "scion";

     

       19
        
           rev = "v${version}";

     

       20
       -
           hash = "sha256-JemqSr1XBwW1hLuWQrApY/hqLj/VpW3xSJedVIoFSiY=";

     

       21
        
         };

     

       22
        
       

     

       23
       -
         vendorHash = "sha256-akFbHgo8xI2/4aQsyutjhXPM5d0A3se3kG/6Ebw1Qcs=";

     

       24
        
       

     

       25
        
         excludedPackages = [

     

       26
        
           "acceptance"

···

       5
        
         nixosTests,

     

       6
        
       }:

     

       7
        
       let

     

       8
       +
         version = "0.12.0";

     

       9
        
       in

     

       10
        
       

     

       11
        
       buildGoModule {

     
···

       17
        
           owner = "scionproto";

     

       18
        
           repo = "scion";

     

       19
        
           rev = "v${version}";

     

       20
       +
           hash = "sha256-J51GIQQhS623wFUU5dI/TwT2rkDH69518lpdCLZ/iM0=";

     

       21
        
         };

     

       22
        
       

     

       23
       +
         vendorHash = "sha256-Ew/hQM8uhaM89sCcPKUBbiGukDq3h5x+KID3w/8BDHg=";

     

       24
        
       

     

       25
        
         excludedPackages = [

     

       26
        
           "acceptance"