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

Merge master into staging-next

parents 8daf95d1 0242d91e

maintainers/scripts/luarocks-packages.csv

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ lrexlib-oniguruma,,,,,,junestepp 
lrexlib-pcre,,,,,,

lrexlib-posix,,,,,,

lsp-progress.nvim,,,,,5.1,gepbird

lsqlite3,,,,,,

lua-cjson,,,,,,

lua-cmsgpack,,,,,,

lua-curl,,,,,,
@@ -113,6 +114,7 @@ lzextras,,,,,,birdee 
lzn-auto-require,,,,,,mrcjkb

magick,,,,,5.1,donovanglover

markdown,,,,,,

md5,,,,,,

mediator_lua,,,,,,

middleclass,,,,,,

mimetypes,,,,,,
@@ -158,6 +160,7 @@ toml-edit,,,,,5.1,mrcjkb 
tree-sitter-http,,,,0.0.33-1,,

tree-sitter-norg,,,,,5.1,mrcjkb

tree-sitter-orgmode,,,,,5.1,

utf8,,,,,,

vstruct,,,,,,

vusted,,,,,,

xml2lua,,,,,,teto

nixos/modules/services/web-apps/calibre-web.nix

+4 −2
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ in 


      package = lib.mkPackageOption pkgs "calibre-web" { };



      calibrePackage = lib.mkPackageOption pkgs "calibre" { };



      listen = {

        ip = mkOption {

          type = types.str;
@@ -149,8 +151,8 @@ in 
            cfg.options.calibreLibrary != null

          ) "config_calibre_dir = '${cfg.options.calibreLibrary}'"

          ++ optionals cfg.options.enableBookConversion [

            "config_converterpath = '${pkgs.calibre}/bin/ebook-convert'"

            "config_binariesdir = '${pkgs.calibre}/bin/'"

            "config_converterpath = '${cfg.calibrePackage}/bin/ebook-convert'"

            "config_binariesdir = '${cfg.calibrePackage}/bin/'"

          ]

          ++ optional cfg.options.enableKepubify "config_kepubifypath = '${pkgs.kepubify}/bin/kepubify'"

        );

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ let 


  finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" ''

    #!${pkgs.runtimeShell}

    set -euo pipefail

    ${systemdBootBuilder}/bin/systemd-boot "$@"

    ${cfg.extraInstallCommands}

  '';

nixos/tests/bpf.nix

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

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

    # tracepoint

    # 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() }'

    """))

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

    # kprobe

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

    # BTF
@@ -34,12 +29,11 @@ 
        "    printf(\"tgid: %d\\n\", ((struct task_struct*) curtask)->tgid); exit() "

        "}'"))

    # module BTF (bpftrace >= 0.17)

    # test is currently disabled on aarch64 as kfunc does not work there yet

    # https://github.com/iovisor/bpftrace/issues/2496

    print(machine.succeed("uname -m | grep aarch64 || "

        "bpftrace -e 'kfunc:nft_trans_alloc_gfp { "

    print(machine.succeed(

        "bpftrace -e 'fentry:nft_delchain { "

        "    printf(\"portid: %d\\n\", args->ctx->portid); "

        "} BEGIN { exit() }'"))

        "} BEGIN { exit() }'"

    ))

    # glibc includes

    print(machine.succeed("bpftrace -e '#include <errno.h>\n"

        "BEGIN { printf(\"ok %d\\n\", EINVAL); exit(); }'"))

nixos/tests/radicle.nix

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ in 
        )

      with subtest("bob can sync bob's repository from the seed"):

        bob.succeed(

          "cd /tmp/repo && rad sync --fetch --seed ${seed-nid}",

          "cd /tmp/repo && rad sync --seed ${seed-nid}",

          "cd /tmp/repo && git pull"

        )

        assert bob.succeed("cat /tmp/repo/testfile") == "hello bob\n"