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

Merge staging-next into staging

parents 136fe626 a75f57cf

maintainers/maintainer-list.nix

+13 −8
Original line number Diff line number Diff line
@@ -3368,6 +3368,14 @@ 
    githubId = 115711;

    name = "bpaulin";

  };

  bpeetz = {

    name = "Benedikt Peetz";

    email = "benedikt.peetz@b-peetz.de";

    matrix = "@soispha:vhack.eu";

    github = "bpeetz";

    githubId = 140968250;

    keys = [ { fingerprint = "8321 ED3A 8DB9 99A5 1F3B  F80F F268 2914 EA42 DE26"; } ];

  };

  Br1ght0ne = {

    email = "brightone@protonmail.com";

    github = "Br1ght0ne";
@@ -15677,6 +15685,11 @@ 
    githubId = 20619776;

    name = "moni";

  };

  monkieeboi = {

    name = "MonkieeBoi";

    github = "MonkieeBoi";

    githubId = 53400613;

  };

  monsieurp = {

    email = "monsieurp@gentoo.org";

    github = "monsieurp";
@@ -22017,14 +22030,6 @@ 
    githubId = 7116239;

    keys = [ { fingerprint = "E067 520F 5EF2 C175 3F60  50C0 BA46 725F 6A26 7442"; } ];

  };

  soispha = {

    name = "Soispha";

    email = "soispha@vhack.eu";

    matrix = "@soispha:vhack.eu";

    github = "soispha";

    githubId = 132207423;

    keys = [ { fingerprint = "9606 FC74 9FCE 1636 0723  D4AD A5E9 4010 C3A6 42AD"; } ];

  };

  solson = {

    email = "scott@solson.me";

    matrix = "@solson:matrix.org";

nixos/modules/tasks/network-interfaces-scripted.nix

+2 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ let 
             (hasAttr dev cfg.macvlans) ||

             (hasAttr dev cfg.sits) ||

             (hasAttr dev cfg.vlans) ||

             (hasAttr dev cfg.greTunnels) ||

             (hasAttr dev cfg.vswitches)

          then [ "${dev}-netdev.service" ]

          else optional (!config.boot.isContainer) (subsystemDevice dev);
@@ -94,7 +95,7 @@ let 
        networkSetup = lib.mkIf needNetworkSetup

          { description = "Networking Setup";



            after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ];

            after = [ "network-pre.target" ];

            before = [ "network.target" "shutdown.target" ];

            wants = [ "network.target" ];

            # exclude bridges from the partOf relationship to fix container networking bug #47210

nixos/tests/dnsdist.nix

+2 −1
Original line number Diff line number Diff line
@@ -92,10 +92,11 @@ in 
          almost_expiration = server.succeed("date --date '14min'").strip()



      with subtest("The DNSCrypt client can connect to the server"):

          client.wait_until_succeeds("journalctl -u dnscrypt-proxy2 --grep '\[server\] OK'")

          client.wait_until_succeeds("journalctl -u dnscrypt-proxy2 --grep '\\[server\\] OK'")



      with subtest("DNS queries over UDP are working"):

          client.wait_for_open_port(53)

          client.wait_until_succeeds("host -U 192.168.0.1", timeout=60)

          client.succeed("host -U 192.168.0.1 | grep -qF ns.example.org")



      with subtest("DNS queries over TCP are working"):

nixos/tests/redlib.nix

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ import ./make-test-python.nix ( 
  {

    name = "redlib";

    meta.maintainers = with lib.maintainers; [

      soispha

      bpeetz

      Guanran928

    ];

pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix

+10 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  stdenvNoCC,

  lib,

  vscode-utils,

  ruff,

}:



vscode-utils.buildVscodeMarketplaceExtension {
@@ -33,6 +34,15 @@ vscode-utils.buildVscodeMarketplaceExtension { 
    }

    // sources.${stdenvNoCC.system} or (throw "Unsupported system ${stdenvNoCC.system}");



  postInstall = ''

    test -x "$out/$installPrefix/bundled/libs/bin/ruff" || {

      echo "Replacing the bundled ruff binary failed, because 'bundled/libs/bin/ruff' is missing."

      echo "Update the package to the match the new path/behavior."

      exit 1

    }

    ln -sf ${lib.getExe ruff} "$out/$installPrefix/bundled/libs/bin/ruff"

  '';



  meta = {

    license = lib.licenses.mit;

    changelog = "https://marketplace.visualstudio.com/items/charliermarsh.ruff/changelog";