Unverified Commit aae1f8ef authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 449a683b 057d63a7

lib/systems/platforms.nix

+0 −1
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ rec { 
  bluefield2 = {

    gcc = {

      arch = "armv8-a+fp+simd+crc+crypto";

      cpu = "cortex-a72";

    };

  };

nixos/modules/services/networking/tailscale.nix

+24 −0
Original line number Diff line number Diff line
@@ -49,6 +49,15 @@ in { 
        When set to `server` or `both`, IP forwarding will be enabled.

      '';

    };



    authKeyFile = mkOption {

      type = types.nullOr types.path;

      default = null;

      example = "/run/secrets/tailscale_key";

      description = lib.mdDoc ''

        A file containing the auth key.

      '';

    };

  };



  config = mkIf cfg.enable {
@@ -82,6 +91,21 @@ in { 
      stopIfChanged = false;

    };



    systemd.services.tailscaled-autoconnect = mkIf (cfg.authKeyFile != null) {

      after = ["tailscale.service"];

      wants = ["tailscale.service"];

      wantedBy = [ "multi-user.target" ];

      serviceConfig = {

        Type = "oneshot";

      };

      script = with pkgs; ''

        status=$(${config.systemd.package}/bin/systemctl show -P StatusText tailscaled.service)

        if [[ $status != Connected* ]]; then

          ${pkgs.tailscale}/bin/tailscale up --auth-key 'file:${cfg.authKeyFile}'

        fi

      '';

    };



    boot.kernel.sysctl = mkIf (cfg.useRoutingFeatures == "server" || cfg.useRoutingFeatures == "both") {

      "net.ipv4.conf.all.forwarding" = mkOverride 97 true;

      "net.ipv6.conf.all.forwarding" = mkOverride 97 true;

nixos/tests/systemd-networkd-dhcpserver-static-leases.nix

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
import ./make-test-python.nix ({ lib, ... }: {

  name = "systemd-networkd-dhcpserver-static-leases";

  meta = with lib.maintainers; {

    maintainers = [ veehaitch tomfitzhenry ];

    maintainers = [ veehaitch ];

  };

  nodes = {

    router = {

nixos/tests/systemd-networkd-dhcpserver.nix

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
import ./make-test-python.nix ({pkgs, ...}: {

  name = "systemd-networkd-dhcpserver";

  meta = with pkgs.lib.maintainers; {

    maintainers = [ tomfitzhenry ];

    maintainers = [ ];

  };

  nodes = {

    router = { config, pkgs, ... }: {

pkgs/applications/audio/ncspot/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -16,16 +16,16 @@ 


rustPlatform.buildRustPackage rec {

  pname = "ncspot";

  version = "0.13.3";

  version = "0.13.4";



  src = fetchFromGitHub {

    owner = "hrkfdn";

    repo = "ncspot";

    rev = "v${version}";

    hash = "sha256-AXe/ysNYSWC4cuzvN4fLmDyeBxpzciDo8PFjXdzFMl0=";

    hash = "sha256-pYPUYy/ODzg9HN0/PTGZkV1NFBPmluhEwoJjYuZ6DTg=";

  };



  cargoHash = "sha256-y7Vaf4jp2Zds0KsYqF0JBWsbq9IQVu6n0TMo3oGL14A=";

  cargoHash = "sha256-FdXk6SzW0f3jkTfxMd8TMzfJGTRaZjG4qp56yHqDAuw=";



  nativeBuildInputs = [ pkg-config ]

    ++ lib.optional withClipboard python3;