diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 1ba548a4c44e..56017f0b4943 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -42,6 +42,11 @@ jobs: uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0 with: retries: 3 + # The default for this includes code 422, which happens regularly for us when comparing commits: + # 422 - Server Error: Sorry, this diff is taking too long to generate. + # Listing all other values from here to effectively remove 422: + # https://github.com/octokit/plugin-retry.js/blob/9a2443746c350b3beedec35cf26e197ea318a261/src/index.ts#L14 + retry-exempt-status-codes: 400,401,403,404 script: | require('./ci/github-script/prepare.js')({ github, diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dc4d53572525..3197d3c90b29 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5239,12 +5239,6 @@ githubId = 3077118; name = "David McFarland"; }; - coroa = { - email = "jonas@chaoflow.net"; - github = "coroa"; - githubId = 2552981; - name = "Jonas Hörsch"; - }; costrouc = { email = "chris.ostrouchov@gmail.com"; github = "costrouc"; diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py index c7d1292b3e1e..bceee1074844 100755 --- a/maintainers/scripts/remove-old-aliases.py +++ b/maintainers/scripts/remove-old-aliases.py @@ -98,8 +98,8 @@ def get_date_lists( date_too_complex_list.append(f"{lineno:>5} {line}") elif "= with " in line: date_too_complex_list.append(f"{lineno:>5} {line}") - elif "lib.warnOnInstantiate" in line or "warning" in line: - if 'lib.warnOnInstantiate "' in line: + elif "warnAlias" in line or "warning" in line: + if 'warnAlias "' in line: date_older_warning_list.append(line) else: date_too_complex_list.append(f"{lineno:>5} {line}") @@ -140,7 +140,7 @@ def convert(lines: list[str], convert_to: str) -> list[tuple[str, str]]: before_equal, after_equal = ( x.strip() for x in line.split("=", maxsplit=2) ) - if after_equal.startswith("lib.warnOnInstantiate"): + if after_equal.startswith("warnAlias"): after_equal = after_equal.split("\"", maxsplit=3)[2].strip() except ValueError as err: print(err, line, "\n") @@ -162,7 +162,7 @@ def convert(lines: list[str], convert_to: str) -> list[tuple[str, str]]: converted_lines[line] = converted elif convert_to == "warnings": converted = ( - f"{indent}{alias} = lib.warnOnInstantiate \"'{alias_unquoted}' has been" + f"{indent}{alias} = warnAlias \"'{alias_unquoted}' has been" f" renamed to/replaced by '{replacement}'\" {replacement};" f" # Converted to warning {datetime.today().strftime('%Y-%m-%d')}" ) diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 5875d13bf786..d7e9ab7ab162 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -1,4 +1,5 @@ { + options, config, lib, pkgs, @@ -10,11 +11,6 @@ let cfg = config.security.apparmor; enabledPolicies = lib.filterAttrs (n: p: p.state != "disable") cfg.policies; buildPolicyPath = n: p: lib.defaultTo (pkgs.writeText n p.profile) p.path; - - # Accessing submodule options when not defined results in an error thunk rather than a regular option object - # We can emulate the behavior of `