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

Merge master into staging-nixos

parents d518b888 69c2e8b2

nixos/modules/services/networking/netbird.nix

+0 −1
Original line number Diff line number Diff line
@@ -340,7 +340,6 @@ in 
                        substitute ${cfg.ui.package}/share/applications/netbird.desktop \

                            "$out/share/applications/${mkBin "netbird"}.desktop" \

                          --replace-fail 'Name=Netbird' "Name=NetBird @ ${client.service.name}" \

                          --replace-fail '${lib.getExe cfg.ui.package}' "$out/bin/${mkBin "netbird-ui"}" \

                          --replace-fail 'Icon=netbird' "Icon=${cfg.ui.package}/share/pixmaps/netbird.png"

                      '')

                    ];

nixos/tests/netbird.nix

+6 −5
Original line number Diff line number Diff line
@@ -7,11 +7,12 @@ 
  ];



  nodes = {

    node =

      { ... }:

      {

        services.netbird.enable = true;

        services.netbird.clients.custom.port = 51819;

    node = {

      services.netbird = {

        enable = true;

        clients.custom.port = 51819;

        ui.enable = true;

      };

    };

  };

pkgs/build-support/vm/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -403,8 +403,8 @@ let 
        ];

        origArgs = args;

        origBuilder = builder;

        QEMU_OPTS = "${QEMU_OPTS} -m ${toString memSize} -object memory-backend-memfd,id=mem,size=${toString memSize}M,share=on -machine memory-backend=mem";

        passAsFile = [ ]; # HACK fix - see https://github.com/NixOS/nixpkgs/issues/16742

        env.QEMU_OPTS = "${QEMU_OPTS} -m ${toString memSize} -object memory-backend-memfd,id=mem,size=${toString memSize}M,share=on -machine memory-backend=mem";

        __structuredAttrs = true;

      }

    );

pkgs/by-name/at/atuin-desktop/package.nix

+4 −1
Original line number Diff line number Diff line
@@ -125,8 +125,9 @@ rustPlatform.buildRustPackage (finalAttrs: { 


  # Otherwise tauri will look for a private key we don't have.

  tauriConf = builtins.toJSON { bundle.createUpdaterArtifacts = false; };

  passAsFile = [ "tauriConf" ];

  preBuild = ''

    tauriConfPath="tauriConf"

    printf "%s" "$tauriConf" > "$tauriConfPath"

    tauriBuildFlags+=(

      "--config"

      "$tauriConfPath"
@@ -164,6 +165,8 @@ rustPlatform.buildRustPackage (finalAttrs: { 
  ];

  doCheck = !stdenv.isDarwin;



  __structuredAttrs = true;



  meta = {

    description = "Local-first, executable runbook editor";

    homepage = "https://atuin.sh";

pkgs/by-name/db/dbus/package.nix

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ stdenv.mkDerivation (finalAttrs: { 


  __darwinAllowLocalNetworking = true;



  env = lib.optionalAttrs stdenv.hostPlatform.isStatic {

    NIX_LDFLAGS = "-lcap-ng";

  };



  mesonFlags = [

    "--libexecdir=${placeholder "out"}/libexec"

    # datadir from which dbus will load files will be managed by the NixOS module: