Unverified Commit 72a0e639 authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 3a15f234 4db8287a

maintainers/maintainer-list.nix

+11 −0
Original line number Diff line number Diff line
@@ -19610,6 +19610,12 @@ 
    githubId = 52569953;

    name = "Oskar Manhart";

  };

  oskarwires = {

    email = "me@usbcable.io";

    github = "oskarwires";

    githubId = 115482671;

    name = "Oskar";

  };

  osnyx = {

    email = "os@flyingcircus.io";

    github = "osnyx";
@@ -25989,6 +25995,11 @@ 
    githubId = 91203390;

    name = "Felix Kimmel";

  };

  thesn = {

    github = "thesn10";

    githubId = 38666407;

    name = "TheSN";

  };

  thesola10 = {

    email = "me@thesola.io";

    github = "Thesola10";

nixos/modules/services/networking/wireguard-networkd.nix

+11 −3
Original line number Diff line number Diff line
@@ -101,15 +101,22 @@ let 
        iproute2

        systemd

      ];

      # networkd doesn't provide a mechanism for refreshing endpoints.

      # networkd doesn't automatically refresh peer endpoints.

      # See: https://github.com/systemd/systemd/issues/9911

      # This hack does the job but takes down the whole interface to do it.

      script = ''

        ip link delete ${name} || :

        touch /etc/systemd/network/40-${name}.netdev

        networkctl reload

      '';

    };



  # netdev config must be a real file (not a symlink to a store file)

  # so the refresh service can 'touch' it.

  generateRefreshNetdevMode =

    name: interface:

    nameValuePair "systemd/network/40-${name}.netdev" {

      mode = "0444";

    };



in

{

  meta.maintainers = [ lib.maintainers.majiir ];
@@ -225,6 +232,7 @@ in 
      networks = mapAttrs generateNetwork cfg.interfaces;

    };



    environment.etc = mapAttrs' generateRefreshNetdevMode refreshEnabledInterfaces;

    systemd.timers = mapAttrs' generateRefreshTimer refreshEnabledInterfaces;

    systemd.services = (mapAttrs' generateRefreshService refreshEnabledInterfaces) // {

      systemd-networkd.serviceConfig.LoadCredential = flatten (

nixos/modules/services/networking/wireguard.nix

+0 −9
Original line number Diff line number Diff line
@@ -215,15 +215,6 @@ let 
            This option can be set or overridden for individual peers.



            Setting this to `0` disables periodic refresh.



            ::: {.warning}

            When {option}`networking.wireguard.useNetworkd` is enabled, this

            option deletes the Wireguard interface and brings it back up by

            reconfiguring the network with `networkctl reload` on every refresh.

            This could have adverse effects on your network and cause brief

            connectivity blips. See [systemd/systemd#9911](https://github.com/systemd/systemd/issues/9911)

            for an upstream feature request that can make this less hacky.

            :::

          '';

        };

nixos/modules/services/web-apps/mastodon.nix

+6 −0
Original line number Diff line number Diff line
@@ -838,6 +838,12 @@ in 
              ));

            message = "There must be exactly one Sidekiq queue in services.mastodon.sidekiqProcesses with jobClass \"scheduler\".";

          }

          {

            assertion =

              databaseActuallyCreateLocally

              -> lib.versionAtLeast config.services.postgresql.finalPackage.version "14";

            message = "Mastodon requires at least PostgreSQL 14.";

          }

        ];



        environment.systemPackages = [ mastodonTootctl ];

nixos/modules/system/boot/loader/limine/limine.nix

+3 −3
Original line number Diff line number Diff line
@@ -229,10 +229,10 @@ in 
      };



      wallpaperStyle = lib.mkOption {

        default = "streched";

        default = "stretched";

        type = lib.types.enum [

          "centered"

          "streched"

          "stretched"

          "tiled"

        ];

        description = ''
@@ -375,7 +375,7 @@ in 
    }

    (lib.mkIf (cfg.style.wallpapers == [ defaultWallpaper ]) {

      boot.loader.limine.style.backdrop = lib.mkDefault "2F302F";

      boot.loader.limine.style.wallpaperStyle = lib.mkDefault "streched";

      boot.loader.limine.style.wallpaperStyle = lib.mkDefault "stretched";

    })

    (lib.mkIf cfg.enable {

      assertions = [