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

Merge staging-next into staging

parents b47c2dff d6ec3d9f

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

+2 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ 
  Processes also now run as a dynamically allocated user by default instead of

  root.



- The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver.



- `singularity-tools` have the `storeDir` argument removed from its override interface and use `builtins.storeDir` instead.



- Two build helpers in `singularity-tools`, i.e., `mkLayer` and `shellScript`, are deprecated, as they are no longer involved in image-building. Maintainers will remove them in future releases.

nixos/modules/hardware/video/nvidia.nix

+29 −7
Original line number Diff line number Diff line
@@ -254,10 +254,21 @@ in 
        '';

      };



      open = lib.mkEnableOption ''

        the open source NVIDIA kernel module

      open = lib.mkOption {

        example = true;

        description = "Whether to enable the open source NVIDIA kernel module.";

        type = lib.types.bool;

        defaultText = lib.literalExpression ''

          lib.mkIf (lib.versionOlder config.hardware.nvidia.package.version "560") false

        '';

      };



      gsp.enable = lib.mkEnableOption ''

        the GPU System Processor (GSP) on the video card

      '' // {

        defaultText = lib.literalExpression ''lib.versionAtLeast config.hardware.nvidia.package.version "560"'';

        defaultText = lib.literalExpression ''

          config.hardware.nvidia.open || lib.versionAtLeast config.hardware.nvidia.package.version "555"

        '';

      };

    };

  };
@@ -308,7 +319,8 @@ in 
          };

          environment.systemPackages = [ nvidia_x11.bin ];



          hardware.nvidia.open = lib.mkDefault (lib.versionAtLeast nvidia_x11.version "560");

          hardware.nvidia.open = lib.mkIf (lib.versionOlder nvidia_x11.version "560") (lib.mkDefault false);

          hardware.nvidia.gsp.enable = lib.mkDefault (cfg.open || lib.versionAtLeast nvidia_x11.version "555");

        })



        # X11
@@ -367,8 +379,18 @@ in 
            }



            {

              assertion = cfg.open -> (cfg.package ? open && cfg.package ? firmware);

              message = "This version of NVIDIA driver does not provide a corresponding opensource kernel driver";

              assertion = cfg.gsp.enable -> (cfg.package ? firmware);

              message = "This version of NVIDIA driver does not provide a GSP firmware.";

            }



            {

              assertion = cfg.open -> (cfg.package ? open);

              message = "This version of NVIDIA driver does not provide a corresponding opensource kernel driver.";

            }



            {

              assertion = cfg.open -> cfg.gsp.enable;

              message = "The GSP cannot be disabled when using the opensource kernel driver.";

            }



            {
@@ -555,7 +577,7 @@ in 


          services.dbus.packages = lib.optional cfg.dynamicBoost.enable nvidia_x11.bin;



          hardware.firmware = lib.optional (cfg.open || lib.versionAtLeast nvidia_x11.version "555") nvidia_x11.firmware;

          hardware.firmware = lib.optional cfg.gsp.enable nvidia_x11.firmware;



          systemd.tmpfiles.rules =

            [

nixos/modules/services/audio/snapserver.nix

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ in { 
      '') cfg.streams);



    systemd.services.snapserver = {

      after = [ "network.target" ];

      after = [ "network.target" "nss-lookup.target" ];

      description = "Snapserver";

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

      before = [ "mpd.service" "mopidy.service" ];

nixos/tests/all-tests.nix

+1 −0
Original line number Diff line number Diff line
@@ -680,6 +680,7 @@ in { 
  nix-config = handleTest ./nix-config.nix {};

  nix-ld = handleTest ./nix-ld.nix {};

  nix-misc = handleTest ./nix/misc.nix {};

  nix-upgrade = handleTest ./nix/upgrade.nix {inherit (pkgs) nixVersions;};

  nix-required-mounts = runTest ./nix-required-mounts;

  nix-serve = handleTest ./nix-serve.nix {};

  nix-serve-ssh = handleTest ./nix-serve-ssh.nix {};

nixos/tests/kafka.nix

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ let 
in with pkgs; {

  kafka_3_6 = makeKafkaTest "kafka_3_6" { kafkaPackage = apacheKafka_3_6; };

  kafka_3_7 = makeKafkaTest "kafka_3_7" { kafkaPackage = apacheKafka_3_7; };

  kafka_3_8 = makeKafkaTest "kafka_3_8" { kafkaPackage = apacheKafka_3_8; };

  kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; };

  kafka_kraft = makeKafkaTest "kafka_kraft" { kafkaPackage = apacheKafka; mode = "kraft"; };

}