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

Merge master into staging-next

parents 5b7501db 999011cc

maintainers/maintainer-list.nix

+17 −0
Original line number Diff line number Diff line
@@ -4556,6 +4556,12 @@ 
    githubId = 24708079;

    name = "Dan Eads";

  };

  danerieber = {

    email = "danerieber@gmail.com";

    github = "danerieber";

    githubId = 6487079;

    name = "Dane Rieber";

  };

  danid3v = {

    email = "sch220233@spengergasse.at";

    github = "DaniD3v";
@@ -12129,6 +12135,11 @@ 
    githubId = 4969294;

    name = "Louis Tim Larsen";

  };

  louis-thevenet = {

    name = "Louis Thevenet";

    github = "louis-thevenet";

    githubId = 55986107;

  };

  lovek323 = {

    email = "jason@oconal.id.au";

    github = "lovek323";
@@ -17234,6 +17245,12 @@ 
    githubId = 131856;

    name = "Arnout Engelen";

  };

  racci = {

    name = "James Draycott";

    email = "me@racci.dev";

    github = "DaRacci";

    githubId = 90304606;

  };

  raehik = {

    email = "thefirstmuffinman@gmail.com";

    github = "raehik";

maintainers/scripts/sha-to-sri.py

+5 −1
Original line number Diff line number Diff line
@@ -201,6 +201,10 @@ def fileToSRI(p: Path): 




_SKIP_RE = re.compile("(generated by)|(do not edit)", re.IGNORECASE)

_IGNORE = frozenset({

    "gemset.nix",

    "yarn.nix",

})



if __name__ == "__main__":

    from sys import argv
@@ -239,7 +243,7 @@ if __name__ == "__main__": 
                logger.info("Recursing into directory")

                for q in p.glob("**/*.nix"):

                    if q.is_file():

                        if q.name == "yarn.nix" or q.name.find("generated") != -1:

                        if q.name in _IGNORE or q.name.find("generated") != -1:

                            logger.info("File looks autogenerated, skipping!")

                            continue

nixos/modules/installer/cd-dvd/installation-cd-base.nix

+2 −6
Original line number Diff line number Diff line 
# This module contains the basic configuration for building a NixOS

# installation CD.



{ config, lib, options, pkgs, ... }:



with lib;



{

  imports =

    [ ./iso-image.nix
@@ -32,8 +28,8 @@ with lib; 


  # An installation media cannot tolerate a host config defined file

  # system layout on a fresh machine, before it has been formatted.

  swapDevices = mkImageMediaOverride [ ];

  fileSystems = mkImageMediaOverride config.lib.isoFileSystems;

  swapDevices = lib.mkImageMediaOverride [ ];

  fileSystems = lib.mkImageMediaOverride config.lib.isoFileSystems;



  boot.postBootCommands = ''

    for o in $(</proc/cmdline); do

nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix

+1 −5
Original line number Diff line number Diff line 
# This module contains the basic configuration for building a graphical NixOS

# installation CD.



{ lib, pkgs, ... }:



with lib;



{

  imports = [ ./installation-cd-base.nix ];
@@ -26,7 +22,7 @@ with lib; 


  # Provide networkmanager for easy wireless configuration.

  networking.networkmanager.enable = true;

  networking.wireless.enable = mkImageMediaOverride false;

  networking.wireless.enable = lib.mkImageMediaOverride false;



  # KDE complains if power management is disabled (to be precise, if

  # there is no power management backend such as upower).

nixos/modules/installer/scan/detected.nix

+1 −4
Original line number Diff line number Diff line 
# List all devices which are detected by nixos-generate-config.

# Common devices are enabled by default.

{ lib, ... }:



with lib;



{

  config = mkDefault {

  config = lib.mkDefault {

    # Common firmware, i.e. for wifi cards

    hardware.enableRedistributableFirmware = true;

  };