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

Merge master into staging-next

parents 72e33030 63d3e6c6

maintainers/maintainer-list.nix

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

    githubId = 66514911;

  };

  deftdawg = {

    name = "DeftDawg";

    github = "deftdawg";

    email = "deftdawg@gmail.com";

    githubId = 4991612;

  };

  deifactor = {

    name = "Ash Zahlen";

    email = "ext0l@riseup.net";

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

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ 
    [2.24](https://nix.dev/manual/nix/latest/release-notes/rl-2.24).

  Notable changes include improvements to Git fetching, documentation comment support in `nix-repl> :doc`, as well as many quality of life improvements.



- This will be the last release of Nixpkgs to support versions of CUDA prior to CUDA 12.0.

  These versions only work with old compiler versions that will be unsupported by the time of the Nixpkgs 25.05 release.

  In future, users should expect CUDA versions to be dropped as the compiler versions they require leave upstream support windows.



- Convenience options for `amdgpu`, open source driver for Radeon cards, is now available under `hardware.amdgpu`.



- [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured as `hardware.amdgpu.amdvlk` option.

nixos/modules/config/terminfo.nix

+25 −15
Original line number Diff line number Diff line
@@ -24,13 +24,21 @@ 


  config = {



    # This should not contain packages that are broken or can't build, since it

    # will break this expression

    #

    # Currently broken packages:

    # - contour

    #

    # can be generated with:

    # lib.attrNames (lib.filterAttrs

    #  (_: drv: (builtins.tryEval (lib.isDerivation drv && drv ? terminfo)).value)

    #  pkgs)

    environment.systemPackages = lib.mkIf config.environment.enableAllTerminfo (map (x: x.terminfo) (with pkgs.pkgsBuildBuild; [

    environment.systemPackages = lib.mkIf config.environment.enableAllTerminfo (

      map (x: x.terminfo) (

        with pkgs.pkgsBuildBuild;

        [

          alacritty

      contour

          foot

          kitty

          mtm
@@ -42,7 +50,9 @@ 
          tmux

          wezterm

          yaft

    ]));

        ]

      )

    );



    environment.pathsToLink = [

      "/share/terminfo"

nixos/modules/installer/cd-dvd/iso-image.nix

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ let 
   * to a menuentry for use in grub.

   *

   *  * defaults: {name, image, params, initrd}

   *  * options: [ option... ]

   *  * options: [ option... ]

   *  * option: {name, params, class}

   */

  menuBuilderGrub2 =

nixos/modules/security/acme/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ let 
      serviceConfig = commonServiceConfig // {

        Group = data.group;



        # Let's Encrypt Failed Validation Limit allows 5 retries per hour, per account, hostname and hour.

        # Let's Encrypt Failed Validation Limit allows 5 retries per hour, per account, hostname and hour.

        # This avoids eating them all up if something is misconfigured upon the first try.

        RestartSec = 15 * 60;