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

Merge master into staging-nixos

parents 89be28ba 1a8e90f7

ci/OWNERS

+1 −2
Original line number Diff line number Diff line
@@ -469,9 +469,8 @@ nixos/tests/incus/ @adamcstephens 
pkgs/by-name/in/incus/                  @adamcstephens

pkgs/by-name/lx/lxc*                    @adamcstephens



# ExpidusOS, Flutter

# Flutter

/pkgs/development/compilers/flutter @RossComputerGuy

/pkgs/desktops/expidus              @RossComputerGuy



# GNU Tar & Zip

/pkgs/tools/archivers/gnutar        @RossComputerGuy

doc/release-notes/rl-2605.section.md

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ gnuradioMinimal.override { 


- `mold` is now wrapped by default.



- `neovim` now disables by default the `python3` and `ruby` providers, unused by most users and reducing closure size from 365MiB to 240MiB. Host provider executables are not exposed anymore along with the neovim wrapper. You can still refer to those using the neovim provider variables (e.g., `python3_host_prog`).

- The `neovim` package and module now disable by default the `python3` and `ruby` providers, unused by most users and reducing closure size from 365MiB to 240MiB. Host provider executables are not exposed anymore along with the neovim wrapper. You can still refer to those using the neovim provider variables (e.g., `python3_host_prog`).



### Deprecations {#sec-nixpkgs-release-26.05-lib-deprecations}

nixos/modules/programs/neovim.nix

+2 −2
Original line number Diff line number Diff line
@@ -51,13 +51,13 @@ in 


    withRuby = lib.mkOption {

      type = lib.types.bool;

      default = true;

      default = false;

      description = "Enable Ruby provider.";

    };



    withPython3 = lib.mkOption {

      type = lib.types.bool;

      default = true;

      default = false;

      description = "Enable Python 3 provider.";

    };

nixos/modules/services/security/yubikey-agent.nix

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ in 
  meta.maintainers = with lib.maintainers; [

    philandstuff

    rawkode

    kaynetik

  ];



  options = {

nixos/modules/system/boot/loader/limine/limine-install.py

+11 −8
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ def install_bootloader() -> None: 
            partition formatted as FAT.

        '''))



    if config('secureBoot', 'enable') and not config('secureBoot', 'createAndEnrollKeys') and not os.path.exists("/var/lib/sbctl"):

    if config('secureBoot', 'enable') and not config('secureBoot', 'autoGenerateKeys') and not os.path.exists("/var/lib/sbctl"):

        print("There are no sbctl secure boot keys present. Please generate some.")

        sys.exit(1)
@@ -557,15 +557,18 @@ def install_bootloader() -> None: 


        if config('secureBoot', 'enable'):

            sbctl = os.path.join(str(config('secureBoot', 'sbctl')), 'bin', 'sbctl')

            if config('secureBoot', 'createAndEnrollKeys'):

                print("TEST MODE: creating and enrolling keys")

            if not os.path.exists("/var/lib/sbctl") and config('secureBoot', 'autoGenerateKeys'):

                print('auto generating keys')

                try:

                    subprocess.run([sbctl, 'create-keys'])

                except:

                    print('error: failed to create keys', file=sys.stderr)

                    sys.exit(1)

                if config('secureBoot', 'autoEnrollKeys', 'enable'):

                    try:

                    subprocess.run([sbctl, 'enroll-keys', '--yes-this-might-brick-my-machine'])

                        command = [sbctl, 'enroll-keys']

                        command.extend(config('secureBoot', 'autoEnrollKeys', 'extraArgs'))

                        subprocess.run(command)

                    except:

                        print('error: failed to enroll keys', file=sys.stderr)

                        sys.exit(1)