commit 601099ee4eb25ed952d2d109b1233e9fc4aeba7a · pyrox.dev/nixpkgs

+2

nixos/doc/manual/release-notes/rl-2505.section.md

···

       32
       32
        
         inputs.nixpkgs.url = "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz";

     

       33
       33
        
         ```

     

       34
       34
        
       

     

       35
       35
       +
       - Syncthing has been updated to version 2.0.0.

     

       36
       36
       +
       

     

       35
       37
        
       <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

     

       36
       38
        
       

     

       37
       39
        
       ## New Modules {#sec-release-25.05-new-modules}

+13 -8

nixos/modules/services/networking/syncthing.nix

···

       894
       894
        
                         install -Dm600 -o ${cfg.user} -g ${cfg.group} ${toString cfg.key} ${cfg.configDir}/key.pem

     

       895
       895
        
                       ''}

     

       896
       896
        
                     ''}";

     

       897
       897
       -
                 ExecStart = ''

     

       898
       898
       -
                   ${cfg.package}/bin/syncthing \

     

       899
       899
       -
                     -no-browser \

     

       900
       900
       -
                     -gui-address=${if isUnixGui then "unix://" else ""}${cfg.guiAddress} \

     

       901
       901
       -
                     -config=${cfg.configDir} \

     

       902
       902
       -
                     -data=${cfg.databaseDir} \

     

       903
       903
       -
                     ${escapeShellArgs cfg.extraFlags}

     

       904
       904
       -
                 '';

     

       897
       897
       +
                 ExecStart =

     

       898
       898
       +
                   let

     

       899
       899
       +
                     args = lib.escapeShellArgs (

     

       900
       900
       +
                       (lib.cli.toGNUCommandLine { } {

     

       901
       901
       +
                         "no-browser" = true;

     

       902
       902
       +
                         "gui-address" = (if isUnixGui then "unix://" else "") + cfg.guiAddress;

     

       903
       903
       +
                         "config" = cfg.configDir;

     

       904
       904
       +
                         "data" = cfg.databaseDir;

     

       905
       905
       +
                       })

     

       906
       906
       +
                       ++ cfg.extraFlags

     

       907
       907
       +
                     );

     

       908
       908
       +
                   in

     

       909
       909
       +
                   "${lib.getExe cfg.package} ${args}";

     

       905
       910
        
                 MemoryDenyWriteExecute = true;

     

       906
       911
        
                 NoNewPrivileges = true;

     

       907
       912
        
                 PrivateDevices = true;

+1 -1

nixos/tests/syncthing-folders.nix

···

       4
       4
        
           name:

     

       5
       5
        
           pkgs.runCommand "syncthing-test-certs-${name}" { } ''

     

       6
       6
        
             mkdir -p $out

     

       7
       7
       -
             ${pkgs.syncthing}/bin/syncthing generate --config=$out

     

       7
       7
       +
             ${pkgs.syncthing}/bin/syncthing generate --home=$out

     

       8
       8
        
             ${pkgs.libxml2}/bin/xmllint --xpath 'string(configuration/device/@id)' $out/config.xml > $out/id

     

       9
       9
        
           '';

     

       10
       10
        
         idA = genNodeId "a";

+2 -2

nixos/tests/syncthing.nix

···

       55
       55
        
           a.wait_for_open_port(22000)

     

       56
       56
        
           b.wait_for_open_port(22000)

     

       57
       57
        
       

     

       58
       58
       -
           aDeviceID = a.succeed("syncthing -home=%s -device-id" % confdir).strip()

     

       59
       59
       -
           bDeviceID = b.succeed("syncthing -home=%s -device-id" % confdir).strip()

     

       58
       58
       +
           aDeviceID = a.succeed("syncthing --home=%s device-id" % confdir).strip()

     

       59
       59
       +
           bDeviceID = b.succeed("syncthing --home=%s device-id" % confdir).strip()

     

       60
       60
        
           addPeer(a, "b", bDeviceID)

     

       61
       61
        
           addPeer(b, "a", aDeviceID)

     

       62
       62

+3 -3

pkgs/applications/networking/syncthing/default.nix

···

       19
       19
        
           }:

     

       20
       20
        
           buildGoModule rec {

     

       21
       21
        
             pname = stname;

     

       22
       22
       -
             version = "1.30.0";

     

       22
       22
       +
             version = "2.0.3";

     

       23
       23
        
       

     

       24
       24
        
             src = fetchFromGitHub {

     

       25
       25
        
               owner = "syncthing";

     

       26
       26
        
               repo = "syncthing";

     

       27
       27
        
               tag = "v${version}";

     

       28
       28
       -
               hash = "sha256-GKyzJ2kzs2h/tfb3StSleGBofiKk6FwVcSkCjsJRvRY=";

     

       28
       28
       +
               hash = "sha256-s5kW7FJfLSTezG/PvRGEoBBlMhYUoszpduKFKlnCcaU=";

     

       29
       29
        
             };

     

       30
       30
        
       

     

       31
       31
       -
             vendorHash = "sha256-Soky/3wEmP1QRy8xfL68sTHi3CSl4nbCINmG0DY2Qys=";

     

       31
       31
       +
             vendorHash = "sha256-Ws++TwmOcWe1ArRuQzIgEIUCHGC30LU4Y4zYUrBkpmA=";

     

       32
       32
        
       

     

       33
       33
        
             nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [

     

       34
       34
        
               # Recent versions of macOS seem to require binaries to be signed when