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

Merge master into staging-next

parents ca50c5b3 9868368d

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -16251,6 +16251,12 @@ 
    github = "M0ustach3";

    githubId = 37956764;

  };

  m1-s = {

    email = "michael@m1-s.com";

    github = "m1-s";

    githubId = 94642227;

    name = "Michael Schneider";

  };

  m1cr0man = {

    email = "lucas+nix@m1cr0man.com";

    github = "m1cr0man";

nixos/lib/test-driver/src/test_driver/__init__.py

+5 −1
Original line number Diff line number Diff line
@@ -174,7 +174,11 @@ def generate_driver_symbols() -> None: 
            vlans=[],

            global_timeout=0,

            enable_ssh_backdoor=False,

            test_script=Path("testScriptWithTypes"),

            test_script=(

                Path("testScriptWithTypes")

                if (Path("testScriptWithTypes").is_file())

                else Path("testScriptFile")

            ),

        ),

        out_dir=Path(),

        logger=CompositeLogger([]),

nixos/lib/testing/driver.nix

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ let 
                testScriptWithTypes

        ''}



        echo -n "$testScript" > testScriptFile



        cp "${config.driverConfiguration.test_script}" $out/test-script



        ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-test-driver

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1833,6 +1833,7 @@ 
  ./services/web-servers/traefik.nix

  ./services/web-servers/trafficserver/default.nix

  ./services/web-servers/ttyd.nix

  ./services/web-servers/tusd.nix

  ./services/web-servers/unit/default.nix

  ./services/web-servers/uwsgi.nix

  ./services/web-servers/varnish/default.nix

nixos/modules/services/desktops/blueman.nix

+16 −0
Original line number Diff line number Diff line
@@ -13,6 +13,12 @@ in 
  options = {

    services.blueman = {

      enable = lib.mkEnableOption "blueman, a bluetooth manager";



      withApplet = lib.mkOption {

        type = lib.types.bool;

        default = true;

        description = "Whether to spawn the Blueman tray applet.";

      };

    };

  };
@@ -24,5 +30,15 @@ in 
    services.dbus.packages = [ pkgs.blueman ];



    systemd.packages = [ pkgs.blueman ];



    systemd.user.services.blueman-applet = lib.mkIf cfg.withApplet {

      description = "Blueman tray applet";

      wantedBy = [ "graphical-session.target" ];

      partOf = [ "graphical-session.target" ];

      serviceConfig = {

        ExecStart = "${pkgs.blueman}/bin/blueman-applet";

        Restart = "on-failure";

      };

    };

  };

}