Unverified Commit 120a26f8 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #271377: staging-next 2023-12-01

parents c8137317 48b286bd

doc/languages-frameworks/rust.section.md

+1 −2
Original line number Diff line number Diff line
@@ -963,7 +963,7 @@ repository: 
     lib.updateManyAttrsByPath [{

       path = [ "packages" "stable" ];

       update = old: old.overrideScope(final: prev: {

         rustc = prev.rustc.overrideAttrs (_: {

         rustc-unwrapped = prev.rustc-unwrapped.overrideAttrs (_: {

           src = lib.cleanSource /git/scratch/rust;

           # do *not* put passthru.isReleaseTarball=true here

         });
@@ -1003,4 +1003,3 @@ nix-build $NIXPKGS -A package-broken-by-rust-changes 
The `git submodule update --init` and `cargo vendor` commands above

require network access, so they can't be performed from within the

`rustc` derivation, unfortunately.

nixos/doc/manual/release-notes/rl-2405.section.md

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m 
  The `nimPackages` and `nim2Packages` sets have been removed.

  See https://nixos.org/manual/nixpkgs/unstable#nim for more information.



- `libass` now uses the native CoreText backend on Darwin, which may fix subtitle rendering issues with `mpv`, `ffmpeg`, etc.



- The Yama LSM is now enabled by default in the kernel, which prevents ptracing

  non-child processes. This means you will not be able to attach gdb to an

  existing process, but will need to start that process from gdb (so it is a

nixos/tests/unbound.nix

+8 −8
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: 
              {

                name = ".";

                forward-addr = [

                  (lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv6.addresses).address

                  (lib.head nodes.authoritative.config.networking.interfaces.eth1.ipv4.addresses).address

                  (lib.head nodes.authoritative.networking.interfaces.eth1.ipv6.addresses).address

                  (lib.head nodes.authoritative.networking.interfaces.eth1.ipv4.addresses).address

                ];

              }

            ];
@@ -168,8 +168,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: 
          "unbound-extra1.conf".text = ''

            forward-zone:

            name: "example.local."

            forward-addr: ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address}

            forward-addr: ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}

            forward-addr: ${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address}

            forward-addr: ${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}

          '';

          "unbound-extra2.conf".text = ''

            auth-zone:
@@ -187,8 +187,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: 
      client = { lib, nodes, ... }: {

        imports = [ common ];

        networking.nameservers = [

          (lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address

          (lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address

          (lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address

          (lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address

        ];

        networking.interfaces.eth1.ipv4.addresses = [

          { address = "192.168.0.10"; prefixLength = 24; }
@@ -276,7 +276,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: 
      resolver.wait_for_unit("multi-user.target")



      with subtest("client should be able to query the resolver"):

          test(client, ["${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True)

          test(client, ["${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address}", "${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}"], doh=True)



      # discard the client we do not need anymore

      client.shutdown()
@@ -298,7 +298,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: 
          ).strip()



          # Thank you black! Can't really break this line into a readable version.

          expected = "example.local. IN forward ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv6.addresses).address} ${(lib.head nodes.resolver.config.networking.interfaces.eth1.ipv4.addresses).address}"

          expected = "example.local. IN forward ${(lib.head nodes.resolver.networking.interfaces.eth1.ipv6.addresses).address} ${(lib.head nodes.resolver.networking.interfaces.eth1.ipv4.addresses).address}"

          assert out == expected, f"Expected `{expected}` but got `{out}` instead."

          local_resolver.fail("sudo -u unauthorizeduser -- unbound-control list_forwards")

pkgs/applications/editors/vim/common.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub }:

rec {

  version = "9.0.2048";

  version = "9.0.2116";



  src = fetchFromGitHub {

    owner = "vim";

    repo = "vim";

    rev = "v${version}";

    hash = "sha256-zR2iPiD4/gf5BnxYoe3cx2ebGWE1P2bY4Cg15gveFgg=";

    hash = "sha256-ZKcNg/RrjvEsxpIcTjzQYi1xig3zLeTV+PXaBb4gUuM=";

  };



  enableParallelBuilding = true;

pkgs/applications/editors/vis/default.nix

+0 −4
Original line number Diff line number Diff line
@@ -30,10 +30,6 @@ stdenv.mkDerivation rec { 
    libselinux

  ];



  postPatch = ''

    patchShebangs ./configure

  '';



  postInstall = ''

    wrapProgram $out/bin/vis \

      --prefix LUA_CPATH ';' "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \