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

Merge master into staging-next

parents a0532437 4f4026f3

nixos/modules/services/networking/clatd.nix

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ in 
          "AF_INET"

          "AF_INET6"

          "AF_NETLINK"

          "AF_UNIX"

        ];

        RestrictNamespaces = true;

        RestrictRealtime = true;

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ in { 
  cinnamon = handleTest ./cinnamon.nix {};

  cinnamon-wayland = handleTest ./cinnamon-wayland.nix {};

  cjdns = handleTest ./cjdns.nix {};

  clatd = handleTest ./clatd.nix {};

  clatd = runTest ./clatd.nix;

  clickhouse = handleTest ./clickhouse.nix {};

  cloud-init = handleTest ./cloud-init.nix {};

  cloud-init-hostname = handleTest ./cloud-init-hostname.nix {};

nixos/tests/clatd.nix

+158 −176
Original line number Diff line number Diff line
@@ -26,17 +26,15 @@ 
#        |         Route:   192.0.2.0/24 via 100.64.0.1

#        +------



import ./make-test-python.nix (

  { pkgs, lib, ... }:

{ lib, ... }:



{

  name = "clatd";

    meta = with pkgs.lib.maintainers; {

      maintainers = [



  meta.maintainers = with lib.maintainers; [

    hax404

    jmbaur

  ];

    };



  nodes = {

    # The server is configured with static IPv4 addresses. RFC 6052 Section 3.1
@@ -179,7 +177,9 @@ import ./make-test-python.nix ( 
    # server, the client starts the clat daemon which starts and configures the

    # local IPv4 -> IPv6 translation via Tayga after discovering the PLAT

    # prefix via DNS64.

      client = {

    client =

      { pkgs, ... }:

      {

        virtualisation.vlans = [

          3 # towards router

        ];
@@ -193,28 +193,11 @@ import ./make-test-python.nix ( 
          enable = true;

          networks."vlan1" = {

            matchConfig.Name = "eth1";



            # NOTE: clatd does not actually use the PREF64 prefix discovered by

            # systemd-networkd (nor does systemd-networkd do anything with it,

            # yet), but we set this to confirm it works. See the test script

            # below.

            ipv6AcceptRAConfig.UsePREF64 = true;

          };

        };



        services.clatd = {

          enable = true;

          # NOTE: Perl's Net::DNS resolver does not seem to work well querying

          # for AAAA records to systemd-resolved's default IPv4 bind address

          # (127.0.0.53), so we add an IPv6 listener address to systemd-resolved

          # and tell clatd to use that instead.

          settings.dns64-servers = "::1";

        };



        # Allow clatd to find dns server. See comment above.

        services.resolved.extraConfig = ''

          DNSStubListenerExtra=::1

        '';

        services.clatd.enable = true;



        environment.systemPackages = [ pkgs.mtr ];

      };
@@ -227,7 +210,7 @@ import ./make-test-python.nix ( 


    # wait for all machines to start up

    for machine in client, router, server:

        machine.wait_for_unit("network-online.target")

      machine.wait_for_unit("network.target")



    with subtest("Wait for tayga and clatd"):

      router.wait_for_unit("tayga.service")
@@ -251,4 +234,3 @@ import ./make-test-python.nix ( 
    client.log(client.execute("systemd-analyze security clatd.service")[1])

  '';

}
 
)

pkgs/applications/audio/jamesdsp/default.nix

+9 −0
Original line number Diff line number Diff line 
{

  copyDesktopItems,

  fetchFromGitHub,

  fetchpatch,

  glibmm,

  gst_all_1,

  lib,
@@ -42,6 +43,14 @@ stdenv.mkDerivation (finalAttrs: { 
    wrapQtAppsHook

  ];



  patches = [

    (fetchpatch {

      url = "https://github.com/Audio4Linux/JDSP4Linux/pull/241.patch";

      hash = "sha256-RtVKlw2ca8An4FodeD0RN95z9yHDHBgAxsEwLAmW7co=";

      name = "fix-build-with-new-pipewire.patch";

    })

  ];



  buildInputs =

    [

      glibmm

pkgs/by-name/bu/buildpack/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


let

  pname = "pack";

  version = "0.36.4";

  version = "0.37.0";

in

buildGoModule {

  inherit pname version;
@@ -16,10 +16,10 @@ buildGoModule { 
    owner = "buildpacks";

    repo = pname;

    rev = "refs/tags/v${version}";

    hash = "sha256-6cWmBNlmPnNszmv6zaHlyd8GqncMtttKOMfQxxJGJ18=";

    hash = "sha256-QCN0UvWa5u9XX5LvY3yD8Xz2s1XzZUg/WXnAfWwZnY0=";

  };



  vendorHash = "sha256-9fO/jwTpVvCdHIy1GrE2YZr7jN7Oyw64EbS2w08VOVI=";

  vendorHash = "sha256-W8FTk2eJYaTE9gCRwrT+mDhda/ZZeCytqQ9vvVZZHSQ=";



  nativeBuildInputs = [ installShellFiles ];