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

Merge master into staging-nixos

parents 6f79754f 562f7285

maintainers/maintainer-list.nix

+0 −6
Original line number Diff line number Diff line
@@ -22033,12 +22033,6 @@ 
    githubId = 1810487;

    name = "Rika";

  };

  rileyinman = {

    email = "rileyminman@gmail.com";

    github = "rileyinman";

    githubId = 37246692;

    name = "Riley Inman";

  };

  rinx = {

    email = "rintaro.okamura@gmail.com";

    github = "rinx";

nixos/modules/hardware/facter/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
}:

{

  imports = [

    ./disk.nix

    ./keyboard.nix

    ./system.nix

  ];

nixos/modules/hardware/facter/disk.nix

0 → 100644
+28 −0
Original line number Diff line number Diff line 
{ lib, config, ... }:

let

  facterLib = import ./lib.nix lib;



  inherit (config.hardware.facter) report;

in

{

  options.hardware.facter.detected.boot.disk.kernelModules = lib.mkOption {

    type = lib.types.listOf lib.types.str;

    default = lib.uniqueStrings (

      facterLib.collectDrivers (

        # A disk might be attached.

        (report.hardware.firewire_controller or [ ])

        # definitely important

        ++ (report.hardware.disk or [ ])

        ++ (report.hardware.storage_controller or [ ])

      )

    );

    defaultText = "hardware dependent";

    description = ''

      List of kernel modules that are needed to access the disk.

    '';

  };



  config = {

    boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.disk.kernelModules;

  };

}

nixos/modules/hardware/facter/keyboard.nix

0 → 100644
+21 −0
Original line number Diff line number Diff line 
{ lib, config, ... }:

let

  facterLib = import ./lib.nix lib;



  inherit (config.hardware.facter) report;

in

{

  options.hardware.facter.detected.boot.keyboard.kernelModules = lib.mkOption {

    type = lib.types.listOf lib.types.str;

    default = lib.uniqueStrings (facterLib.collectDrivers (report.hardware.usb_controller or [ ]));

    defaultText = "hardware dependent";

    example = [ "usbhid" ];

    description = ''

      List of kernel modules to include in the initrd to support the keyboard.

    '';

  };



  config = {

    boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.keyboard.kernelModules;

  };

}

pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { 
  mktplcRef = {

    name = "claude-code";

    publisher = "anthropic";

    version = "2.0.25";

    hash = "sha256-I4z39qCDraRbpFlgUPW6KQcuALZYRqlLT6poJzs/8d8=";

    version = "2.0.26";

    hash = "sha256-5wEIWlqKVBs7pwzsIAFtAjGWHTjlLI/LzCs+8M0LL9Q=";

  };



  meta = {