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

Merge staging-next into staging

parents db4017b5 9a807b19

ci/OWNERS

+3 −0
Original line number Diff line number Diff line
@@ -129,6 +129,9 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @NixOS/nix-team @raitobeza 
# Systemd-boot

/nixos/modules/system/boot/loader/systemd-boot      @JulienMalka



# Limine

/nixos/modules/system/boot/loader/limine        @lzcunt @phip1611 @programmerlexi



# Images and installer media

/nixos/modules/profiles/installation-device.nix @ElvishJerricco

/nixos/modules/installer/cd-dvd/                @ElvishJerricco

maintainers/maintainer-list.nix

+11 −6
Original line number Diff line number Diff line
@@ -3570,6 +3570,12 @@ 
    githubId = 32319131;

    name = "Brett L";

  };

  bubblepipe = {

    email = "bubblepipe42@gmail.com";

    github = "bubblepipe";

    githubId = 30717258;

    name = "bubblepipe";

  };

  buckley310 = {

    email = "sean.bck@gmail.com";

    matrix = "@buckley310:matrix.org";
@@ -8487,12 +8493,6 @@ 
    githubId = 34658064;

    name = "Grace Dinh";

  };

  gebner = {

    email = "gebner@gebner.org";

    github = "gebner";

    githubId = 313929;

    name = "Gabriel Ebner";

  };

  geluk = {

    email = "johan+nix@geluk.io";

    github = "geluk";
@@ -19070,6 +19070,11 @@ 
    githubId = 74465;

    name = "James Fargher";

  };

  programmerlexi = {

    name = "programmerlexi";

    github = "programmerlexi";

    githubId = 60185691;

  };

  progrm_jarvis = {

    email = "mrjarviscraft+nix@gmail.com";

    github = "JarvisCraft";

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

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ 


- [Rebuilderd](https://github.com/kpcyrd/rebuilderd) an independent verification of binary packages - Reproducible Builds. Available as [services.rebuilderd](#opt-services.rebuilderd.enable).



- [Limine](https://github.com/limine-bootloader/limine) a modern, advanced, portable, multiprotocol bootloader and boot manager. Available as [boot.loader.limine](#opt-boot.loader.limine.enable)



<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->



## Backward Incompatibilities {#sec-release-25.05-incompatibilities}

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1719,6 +1719,7 @@ 
  ./system/boot/loader/grub/memtest.nix

  ./system/boot/loader/external/external.nix

  ./system/boot/loader/init-script/init-script.nix

  ./system/boot/loader/limine/limine.nix

  ./system/boot/loader/loader.nix

  ./system/boot/loader/systemd-boot/systemd-boot.nix

  ./system/boot/luksroot.nix

nixos/modules/security/krb5/krb5-conf-format.nix

+26 −9
Original line number Diff line number Diff line
@@ -61,16 +61,33 @@ rec { 
            description = "Which principal the rule applies to";

          };

          access = mkOption {

            type = either (listOf (enum [

            type = coercedTo str singleton (

              listOf (enum [

                "all"

                "add"

                "cpw"

                "delete"

                "get-keys"

                "get"

                "list"

                "modify"

            ])) (enum [ "all" ]);

              ])

            );

            default = "all";

            description = "The changes the principal is allowed to make.";

            description = ''

              The changes the principal is allowed to make.



              :::{.important}

              The "all" permission does not imply the "get-keys" permission. This

              is consistent with the behavior of both MIT Kerberos and Heimdal.

              :::



              :::{.warning}

              Value "all" is allowed as a list member only if it appears alone

              or accompanied by "get-keys". Any other combination involving

              "all" will raise an exception.

              :::

            '';

          };

          target = mkOption {

            type = str;