Merge master into staging-next

Author: nixpkgs-ci[bot]

nixos/modules/services/misc/octoprint.nix

@@ -11,7 +11,7 @@ let
   baseConfig = lib.recursiveUpdate {
     plugins.curalegacy.cura_engine = "${pkgs.curaengine_stable}/bin/CuraEngine";
     server.port = cfg.port;
-    webcam.ffmpeg = "${pkgs.ffmpeg.bin}/bin/ffmpeg";
+    webcam.ffmpeg = "${pkgs.ffmpeg-headless.bin}/bin/ffmpeg";
   } (lib.optionalAttrs (cfg.host != null) { server.host = cfg.host; });
 
   fullConfig = lib.recursiveUpdate cfg.extraConfig baseConfig;

nixos/modules/services/networking/autossh-ng.nix

@@ -105,6 +105,8 @@ in
           wantedBy = [ "multi-user.target" ];
 
           serviceConfig = {
+            Type = "notify";
+            NotifyAccess = "all";
             User = "${s.user}";
             # backoff would be nice, but doesn't automatically
             # get reset on successful start yet, so static 10s restart for now:
@@ -117,11 +119,16 @@ in
                     "-o \"UserKnownHostsFile=${s.knownHostsFile}\""
                   else
                     "-o \"UserKnownHostsFile=/dev/null\" -o \"StrictHostKeyChecking=no\"";
+                ready = pkgs.writers.writeBash "systemd-signal-ready" ''
+                  ${pkgs.systemd}/bin/systemd-notify --ready
+                '';
               in
               ''
                 ${pkgs.openssh}/bin/ssh \
                   -o "ServerAliveInterval 30" \
                   -o "ServerAliveCountMax 3" \
+                  -o "PermitLocalCommand=yes" \
+                  -o "LocalCommand ${ready}" \
                   -o ExitOnForwardFailure=yes \
                   ${hostKeyCheckOption} \
                   -N \

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

@@ -250,5 +250,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ pborzenkov ];
+  meta.maintainers = [ ];
 }

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

@@ -50,7 +50,7 @@ in
 
     package = lib.mkPackageOption pkgs "onlyoffice-documentserver" { };
 
-    x2t = lib.mkPackageOption pkgs "x2t" { };
+    x2t = lib.mkPackageOption pkgs "onlyoffice-documentserver.passthru.x2t" { };
 
     port = lib.mkOption {
       type = lib.types.port;

pkgs/by-name/ba/baresip/package.nix

@@ -31,14 +31,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "4.6.0";
+  version = "4.7.0";
   pname = "baresip";
 
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "baresip";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ikfSr9chbkv+5XPlDZKH/80N98tBzHvyNf29kENXOFI=";
+    hash = "sha256-IfzLwK6mDfMPug6vRfsOJwByP6LwGkefh8lBC75eVbU=";
   };
 
   patches = [

pkgs/by-name/bi/bitwarden-desktop/package.nix

@@ -196,6 +196,7 @@ buildNpmPackage' rec {
     cp -r apps/desktop/dist/linux-*unpacked/{locales,resources{,.pak}} $out/opt/Bitwarden
 
     makeWrapper '${lib.getExe electron}' "$out/bin/bitwarden" \
+      --run "ulimit -c 0" \
       --add-flags $out/opt/Bitwarden/resources/app.asar \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
       --set-default ELECTRON_IS_DEV 0 \

pkgs/by-name/br/brltty/package.nix

@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "brltty";
-  version = "6.9";
+  version = "6.9.1";
 
   src = fetchurl {
     url = "https://brltty.app/archive/brltty-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-KiWymWeI5RqRq++m23SJKnZYowqIbdBSrmffZ59FDaQ=";
+    sha256 = "sha256-gi3iyHtECf3wLWFU0bRoVsNTnT6onGWu80MPJ3Nnf3Y=";
   };
 
   depsBuildBuild = [ pkg-config ];

pkgs/by-name/ca/calibre-web/package.nix

@@ -154,7 +154,7 @@ python3Packages.buildPythonApplication rec {
     # changelog = "https://github.com/janeczku/calibre-web/releases/tag/${src.tag}";
     changelog = "https://github.com/janeczku/calibre-web/compare/0.6.26...${src.rev}";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ pborzenkov ];
+    maintainers = [ ];
     mainProgram = "calibre-web";
     platforms = lib.platforms.all;
   };

pkgs/by-name/de/delve/package.nix

@@ -4,6 +4,7 @@
   fetchFromGitHub,
   stdenv,
   nix-update-script,
+  installShellFiles,
 }:
 
 buildGoModule (finalAttrs: {
@@ -23,6 +24,8 @@ buildGoModule (finalAttrs: {
 
   vendorHash = null;
 
+  nativeBuildInputs = [ installShellFiles ];
+
   subPackages = [ "cmd/dlv" ];
 
   ldflags = [
@@ -48,6 +51,11 @@ buildGoModule (finalAttrs: {
     # add symlink for vscode golang extension
     # https://github.com/golang/vscode-go/blob/master/docs/debugging.md#manually-installing-dlv-dap
     ln $out/bin/dlv $out/bin/dlv-dap
+
+    installShellCompletion --cmd dlv \
+      --bash <($out/bin/dlv completion bash) \
+      --fish <($out/bin/dlv completion fish) \
+      --zsh <($out/bin/dlv completion zsh)
   '';
 
   # delve doesn't support --version

pkgs/by-name/dn/dnsdist/package.nix

@@ -1,10 +1,8 @@
 {
   boost,
   cargo,
-  fetchpatch,
   fetchurl,
   fstrm,
-  h2o,
   lib,
   libbpf,
   libcap,
@@ -28,22 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dnsdist";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/dnsdist-${finalAttrs.version}.tar.xz";
-    hash = "sha256-M3Trplpco8+5/Fl5HEflA1FJ/lIcy7ztX4NKF/RWQb8=";
+    hash = "sha256-oiklC4GcQNVRc6+nIC7x7yprco+Fx1Bol6Hxymq1cUk=";
   };
 
-  patches = [
-    # Fix build error when only protobuf is enabled
-    (fetchpatch {
-      url = "https://github.com/PowerDNS/pdns/commit/daece82818d7f83b26dcf724ec1864644bc3f854.patch";
-      hash = "sha256-Ag65Gjmm2m4yvRfqMjSo1EEJg/2EHWDBg15vSL5DKCU=";
-      stripLen = 2;
-    })
-  ];
-
   nativeBuildInputs = [
     cargo
     pkg-config
@@ -52,10 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.pyyaml
     rustPlatform.cargoSetupHook
   ];
+
   buildInputs = [
     boost
     fstrm # Required for DNSTAP
-    h2o
     libbpf
     libcap
     libedit
@@ -91,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) cargoRoot src;
-    hash = "sha256-nDAvgM3xb+95dcGIHiSKlFo4/0Rs5Evf1vvR5vF4MXs=";
+    hash = "sha256-OU24ahqFc4DivCpO451rsHV8rofyHv+LnLgkVsFPMG4=";
   };
 
   cargoRoot = "dnsdist-rust-lib/rust";