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

Merge master into staging-next

parents f5c2101b cf2f6d33

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -25117,6 +25117,12 @@ 
    githubId = 58266;

    name = "Sebastián Zaffarano";

  };

  szanko = {

    email = "szanko_dev@proton.me";

    github = "SZanko";

    githubId = 38001059;

    name = "Stefan Zanko";

  };

  szczyp = {

    email = "qb@szczyp.com";

    github = "Szczyp";

nixos/modules/hardware/tuxedo-drivers.nix

+1 −0
Original line number Diff line number Diff line
@@ -31,5 +31,6 @@ in 
  config = lib.mkIf cfg.enable {

    boot.kernelModules = [ "tuxedo_keyboard" ];

    boot.extraModulePackages = [ tuxedo-drivers ];

    services.udev.packages = [ tuxedo-drivers ];

  };

}

nixos/modules/services/networking/dnscrypt-proxy.nix

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ in 
            ${

              if cfg.upstreamDefaults then

                ''

                  ${pkgs.buildPackages.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy.src}/dnscrypt-proxy/example-dnscrypt-proxy.toml > example.json

                  ${pkgs.buildPackages.remarshal}/bin/toml2json ${pkgs.dnscrypt-proxy}/etc/dnscrypt-proxy/dnscrypt-proxy.toml > example.json

                  ${pkgs.buildPackages.jq}/bin/jq --slurp add example.json $jsonPath > config.json # merges the two

                ''

              else

nixos/tests/bpf.nix

+6 −1
Original line number Diff line number Diff line
@@ -21,7 +21,12 @@ 
    # simple BEGIN probe (user probe on bpftrace itself)

    print(machine.succeed("bpftrace -e 'BEGIN { print(\"ok\\n\"); exit(); }'"))

    # tracepoint

    print(machine.succeed("bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit() }'"))

    # workaround: this needs more than the default of 1k FD to attach ~350 probes, bump fd limit

    # see https://github.com/bpftrace/bpftrace/issues/2110

    print(machine.succeed("""

        ulimit -n 2048

        bpftrace -e 'tracepoint:syscalls:sys_enter_* { print(probe); exit() }'

    """))

    # kprobe

    print(machine.succeed("bpftrace -e 'kprobe:schedule { print(probe); exit() }'"))

    # BTF

pkgs/applications/editors/vscode/extensions/prince781.vala/default.nix

+9 −1
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
  lib,

  vala-language-server,

  vscode-utils,

  jq,

  moreutils,

}:



vscode-utils.buildVscodeMarketplaceExtension {
@@ -13,9 +15,15 @@ vscode-utils.buildVscodeMarketplaceExtension { 
  };



  nativeBuildInputs = [

    vala-language-server

    jq

    moreutils

  ];



  postInstall = ''

    cd "$out/$installPrefix"

    jq '.contributes.configuration.properties."vala.languageServerPath".default = "${lib.getExe vala-language-server}"' package.json | sponge package.json

  '';



  meta = {

    changelog = "https://marketplace.visualstudio.com/items/prince781.vala/changelog";

    description = "Syntax highlighting and language support for the Vala / Genie languages";