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

Merge master into staging-next

parents 5e051b3c effac2a6

nixos/modules/services/display-managers/cosmic-greeter.nix

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


let

  cfg = config.services.displayManager.cosmic-greeter;

  cfgAutoLogin = config.services.displayManager.autoLogin;

in



{
@@ -35,6 +36,10 @@ in 
          user = "cosmic-greeter";

          command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-greeter ${lib.getExe pkgs.cosmic-comp} ${lib.getExe cfg.package}'';

        };

        initial_session = lib.mkIf (cfgAutoLogin.enable && (cfgAutoLogin.user != null)) {

          user = cfgAutoLogin.user;

          command = ''${lib.getExe' pkgs.coreutils "env"} XCURSOR_THEME="''${XCURSOR_THEME:-Pop}" systemd-cat -t cosmic-session ${lib.getExe pkgs.cosmic-session}'';

        };

      };

    };

nixos/modules/virtualisation/incus.nix

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ let 


  environment = lib.mkMerge [

    {

      INCUS_DOCUMENTATION = "${cfg.package.doc}/html";

      INCUS_EDK2_PATH = ovmf;

      INCUS_LXC_HOOK = "${cfg.lxcPackage}/share/lxc/hooks";

      INCUS_LXC_TEMPLATE_CONFIG = "${pkgs.lxcfs}/share/lxc/config";

nixos/tests/all-tests.nix

+4 −4
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ in 
    imports = [ ./binary-cache.nix ];

    _module.args.compression = "xz";

  };

  bind = handleTest ./bind.nix { };

  bind = runTest ./bind.nix;

  bird = handleTest ./bird.nix { };

  birdwatcher = handleTest ./birdwatcher.nix { };

  bitbox-bridge = runTest ./bitbox-bridge.nix;
@@ -294,7 +294,7 @@ in 
  ] ./ceph-single-node-bluestore-dmcrypt.nix { };

  certmgr = handleTest ./certmgr.nix { };

  cfssl = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cfssl.nix { };

  cgit = handleTest ./cgit.nix { };

  cgit = runTest ./cgit.nix;

  charliecloud = handleTest ./charliecloud.nix { };

  chromadb = runTest ./chromadb.nix;

  chromium = (handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./chromium.nix { }).stable or { };
@@ -584,7 +584,7 @@ in 
  herbstluftwm = handleTest ./herbstluftwm.nix { };

  homebox = handleTest ./homebox.nix { };

  homer = handleTest ./homer { };

  homepage-dashboard = handleTest ./homepage-dashboard.nix { };

  homepage-dashboard = runTest ./homepage-dashboard.nix;

  honk = runTest ./honk.nix;

  installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });

  invidious = handleTest ./invidious.nix { };
@@ -795,7 +795,7 @@ in 
      defaults.services.mongodb.package = config.node.pkgs.mongodb-ce;

    }

  );

  moodle = handleTest ./moodle.nix { };

  moodle = runTest ./moodle.nix;

  moonraker = handleTest ./moonraker.nix { };

  mopidy = handleTest ./mopidy.nix { };

  morph-browser = runTest ./morph-browser.nix;

nixos/tests/bind.nix

+2 −1
Original line number Diff line number Diff line 
import ./make-test-python.nix {

{ ... }:

{

  name = "bind";



  nodes.machine =

nixos/tests/cgit.nix

+95 −97
Original line number Diff line number Diff line 
import ./make-test-python.nix (

{ pkgs, ... }:

let

  robotsTxt = pkgs.writeText "cgit-robots.txt" ''
@@ -110,4 +109,3 @@ import ./make-test-python.nix ( 
      )

    '';

}
 
)