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

Merge master into staging-nixos

parents 81d330e9 60d40a82

ci/github-script/bot.js

+4 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ module.exports = async ({ github, context, core, dry }) => { 
          name: 'maintainers',

        })

      ).data.artifacts[0]

      if (!artifact) continue

      if (!artifact || artifact.expired) continue



      await artifactClient.downloadArtifact(artifact.id, {

        findBy: {
@@ -152,6 +152,8 @@ module.exports = async ({ github, context, core, dry }) => { 
      })

    ).data



    log('author', pull_request.user?.login)



    const maintainers = await getMaintainerMap(pull_request.base.ref)



    const merge_bot_eligible = await handleMerge({
@@ -607,7 +609,7 @@ module.exports = async ({ github, context, core, dry }) => { 
        ).data.artifacts[0]



        // If the artifact is not available, the next iteration starts at the beginning.

        if (artifact) {

        if (artifact && !artifact.expired) {

          stats.artifacts++



          const { downloadPath } = await artifactClient.downloadArtifact(

ci/github-script/reviewers.js

+8 −6
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ async function handleReviewers({ 
  const pull_number = pull_request.number



  const requested_reviewers = new Set(

    pull_request.requested_reviewers.map(({ login }) => login),

    pull_request.requested_reviewers.map(({ login }) => login.toLowerCase()),

  )

  log(

    'reviewers - requested_reviewers',
@@ -22,7 +22,7 @@ async function handleReviewers({ 
  )



  const existing_reviewers = new Set(

    reviews.map(({ user }) => user?.login).filter(Boolean),

    reviews.map(({ user }) => user?.login.toLowerCase()).filter(Boolean),

  )

  log(

    'reviewers - existing_reviewers',
@@ -43,9 +43,11 @@ async function handleReviewers({ 


  const users = new Set([

    ...(await Promise.all(

      maintainers.map(async (id) => (await getUser(id)).login),

      maintainers.map(async (id) => (await getUser(id)).login.toLowerCase()),

    )),

    ...owners.filter((handle) => handle && !handle.includes('/')),

    ...owners

      .filter((handle) => handle && !handle.includes('/'))

      .map((handle) => handle.toLowerCase()),

  ])

  log('reviewers - users', Array.from(users).join(', '))
@@ -60,14 +62,14 @@ async function handleReviewers({ 
  const team_members = new Set(

    (await Promise.all(Array.from(teams, getTeamMembers)))

      .flat(1)

      .map(({ login }) => login),

      .map(({ login }) => login.toLowerCase()),

  )

  log('reviewers - team_members', Array.from(team_members).join(', '))



  const new_reviewers = users

    .union(team_members)

    // We can't request a review from the author.

    .difference(new Set([pull_request.user?.login]))

    .difference(new Set([pull_request.user?.login.toLowerCase()]))

  log('reviewers - new_reviewers', Array.from(new_reviewers).join(', '))



  // Filter users to repository collaborators. If they're not, they can't be requested

nixos/modules/config/vte.nix

+6 −1
Original line number Diff line number Diff line
@@ -9,7 +9,12 @@ let 
  vteInitSnippet = ''

    # Show current working directory in VTE terminals window title.

    # Supports both bash and zsh, requires interactive shell.

    . ${pkgs.vte-gtk4}/etc/profile.d/vte.sh

    . ${

      pkgs.vte.override {

        withApp = false;

        gtkVersion = null;

      }

    }/etc/profile.d/vte.sh

  '';



in

nixos/modules/module-list.nix

+1 −0
Original line number Diff line number Diff line
@@ -1123,6 +1123,7 @@ 
  ./services/networking/chisel-server.nix

  ./services/networking/cjdns.nix

  ./services/networking/clatd.nix

  ./services/networking/cloudflare-ddns.nix

  ./services/networking/cloudflare-dyndns.nix

  ./services/networking/cloudflare-warp.nix

  ./services/networking/cloudflared.nix

nixos/modules/security/apparmor/includes.nix

+15 −15
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ let 
          mode ? "r",

          trail ? "",

        }:

        lib.optionalString (hasAttr path etc) "${mode} ${config.environment.etc.${path}.source}${trail},";

        lib.optionalString (hasAttr path etc) "${config.environment.etc.${path}.source}${trail} ${mode},";

    in

    if isAttrs arg then go arg else go { path = arg; };

in
@@ -93,19 +93,19 @@ in 
    ];

    "abstractions/base" = ''

      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/base"

      r ${pkgs.stdenv.cc.libc}/share/locale/**,

      r ${pkgs.stdenv.cc.libc}/share/locale.alias,

      r ${config.i18n.glibcLocales}/lib/locale/locale-archive,

      ${pkgs.stdenv.cc.libc}/share/locale/** r,

      ${pkgs.stdenv.cc.libc}/share/locale.alias r,

      ${config.i18n.glibcLocales}/lib/locale/locale-archive r,

      ${etcRule "localtime"}

      r ${pkgs.tzdata}/share/zoneinfo/**,

      r ${pkgs.stdenv.cc.libc}/share/i18n/**,

      ${pkgs.tzdata}/share/zoneinfo/** r,

      ${pkgs.stdenv.cc.libc}/share/i18n/** r,

    '';

    "abstractions/bash" = ''

      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/bash"



      # bash inspects filesystems at startup

      # and /etc/mtab is linked to /proc/mounts

      r @{PROC}/mounts,

      @{PROC}/mounts r,



      # system-wide bash configuration

    ''
@@ -296,8 +296,8 @@ in 
      # looking up users by name or id, groups by name or id, hosts by name

      # or IP, etc. These operations may be performed through files, dns,

      # NIS, NIS+, LDAP, hesiod, wins, etc. Allow them all here.

      mr ${getLib pkgs.nss}/lib/libnss_*.so*,

      mr ${getLib pkgs.nss}/lib64/libnss_*.so*,

      ${getLib pkgs.nss}/lib/libnss_*.so* mr,

      ${getLib pkgs.nss}/lib64/libnss_*.so* mr,

    ''

    + lib.concatMapStringsSep "\n" etcRule [

      "group"
@@ -463,11 +463,11 @@ in 
      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/ssl_certs"



      # For the NixOS module: security.acme

      r /var/lib/acme/*/cert.pem,

      r /var/lib/acme/*/chain.pem,

      r /var/lib/acme/*/fullchain.pem,

      /var/lib/acme/*/cert.pem r,

      /var/lib/acme/*/chain.pem r,

      /var/lib/acme/*/fullchain.pem r,



      r /etc/pki/tls/certs/,

      /etc/pki/tls/certs/ r,



    ''

    + lib.concatMapStringsSep "\n" etcRule [
@@ -510,8 +510,8 @@ in 
    ];

    "abstractions/ssl_keys" = ''

      # security.acme NixOS module

      r /var/lib/acme/*/full.pem,

      r /var/lib/acme/*/key.pem,

      /var/lib/acme/*/full.pem r,

      /var/lib/acme/*/key.pem r,

    '';

    "abstractions/vulkan" = ''

      include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/vulkan"