Merge staging-next into staging

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/applications/editors/emacs/sources.nix

@@ -115,6 +115,9 @@ in
         name = "inhibit-lexical-cookie-warning-67916.patch";
         path = ./inhibit-lexical-cookie-warning-67916-30.patch;
       })
+      # tree-sitter 0.26 compatibility fix, from FreeBSD
+      # https://cgit.freebsd.org/ports/plain/editors/emacs/files/patch-src_treesit.c
+      ./tree-sitter-0.26.patch
     ];
   });
 

pkgs/applications/editors/emacs/tree-sitter-0.26.patch

@@ -0,0 +1,56 @@
+--- a/src/treesit.c
++++ b/src/treesit.c
+@@ -34,7 +34,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.or
+ # include "w32common.h"
+ 
+ /* In alphabetical order.  */
+-#undef ts_language_version
++#undef ts_language_abi_version
+ #undef ts_node_child
+ #undef ts_node_child_by_field_name
+ #undef ts_node_child_count
+@@ -89,7 +89,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.or
+ #undef ts_tree_get_changed_ranges
+ #undef ts_tree_root_node
+ 
+-DEF_DLL_FN (uint32_t, ts_language_version, (const TSLanguage *));
++DEF_DLL_FN (uint32_t, ts_language_abi_version, (const TSLanguage *));
+ DEF_DLL_FN (TSNode, ts_node_child, (TSNode, uint32_t));
+ DEF_DLL_FN (TSNode, ts_node_child_by_field_name,
+ 	    (TSNode, const char *, uint32_t));
+@@ -166,7 +166,7 @@ init_treesit_functions (void)
+   if (!library)
+     return false;
+ 
+-  LOAD_DLL_FN (library, ts_language_version);
++  LOAD_DLL_FN (library, ts_language_abi_version);
+   LOAD_DLL_FN (library, ts_node_child);
+   LOAD_DLL_FN (library, ts_node_child_by_field_name);
+   LOAD_DLL_FN (library, ts_node_child_count);
+@@ -224,7 +224,7 @@ init_treesit_functions (void)
+   return true;
+ }
+ 
+-#define ts_language_version fn_ts_language_version
++#define ts_language_abi_version fn_ts_language_abi_version
+ #define ts_node_child fn_ts_node_child
+ #define ts_node_child_by_field_name fn_ts_node_child_by_field_name
+ #define ts_node_child_count fn_ts_node_child_count
+@@ -746,7 +746,7 @@ treesit_load_language (Lisp_Object language_symbol,
+     {
+       *signal_symbol = Qtreesit_load_language_error;
+       *signal_data = list2 (Qversion_mismatch,
+-			    make_fixnum (ts_language_version (lang)));
++			    make_fixnum (ts_language_abi_version (lang)));
+       return NULL;
+     }
+   return lang;
+@@ -817,7 +817,7 @@ Return nil if a grammar library for LANGUAGE is not av
+ 						       &signal_data);
+       if (ts_language == NULL)
+ 	return Qnil;
+-      uint32_t version =  ts_language_version (ts_language);
++      uint32_t version =  ts_language_abi_version (ts_language);
+       return make_fixnum((ptrdiff_t) version);
+     }
+ }

pkgs/build-support/node/import-npm-lock/default.nix

@@ -158,15 +158,15 @@ lib.fix (self: {
       {
         inherit pname version;
 
-        package = toFile (toJSON packageJSON');
-        packageLock = toFile (toJSON packageLock');
+        package = toJSON packageJSON';
+        packageLock = toJSON packageLock';
 
         __structuredAttrs = true;
       }
       ''
         mkdir $out
-        cp "${package}" > $out/package.json
-        cp "${packageLock}" > $out/package-lock.json
+        printf "%s" "$package" > $out/package.json
+        printf "%s" "$packageLock" > $out/package-lock.json
       '';
 
   # Build node modules from package.json & package-lock.json

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 ];