Merge remote-tracking branch 'origin/master' into staging-next

maintainers/maintainer-list.nix

@@ -3132,6 +3132,12 @@
     githubId = 50839;
     name = "Brian Jones";
   };
+  boldikoller = {
+    email = "[email protected]";
+    github = "boldikoller";
+    githubId = 182646310;
+    name = "Boldi Koller";
+  };
   boltzmannrain = {
     email = "[email protected]";
     github = "boltzmannrain";
@@ -12272,6 +12278,12 @@
     githubId = 5759930;
     name = "Alexis Destrez";
   };
+  krovuxdev = {
+    name = "krovuxdev";
+    email = "[email protected]";
+    github = "krovuxdev";
+    githubId = 62192487;
+  };
   krupkat = {
     github = "krupkat";
     githubId = 6817216;
@@ -13180,6 +13192,11 @@
     githubId = 639066;
     name = "Luke Rewega";
   };
+  lriesebos = {
+    name = "Leon Riesebos";
+    github = "lriesebos";
+    githubId = 28567817;
+  };
   lromor = {
     email = "[email protected]";
     github = "lromor";

nixos/modules/services/cluster/hadoop/hbase.nix

@@ -57,7 +57,9 @@ let
       systemd.services."hbase-${lib.toLower name}" = {
         description = "HBase ${name}";
         wantedBy = [ "multi-user.target" ];
-        path = with cfg; [ hbase.package ] ++ optional (with cfg.hbase.master; enable && initHDFS) package;
+        path =
+          with cfg;
+          [ hbase.package ] ++ lib.optional (with cfg.hbase.master; enable && initHDFS) package;
         preStart = lib.mkIf (with cfg.hbase.master; enable && initHDFS) (
           lib.concatStringsSep "\n" (
             map (x: "HADOOP_USER_NAME=hdfs hdfs --config /etc/hadoop-conf ${x}") [

nixos/modules/services/monitoring/netdata.nix

@@ -24,7 +24,7 @@ let
     mkdir $out
     ${lib.concatStringsSep "\n" (lib.mapAttrsToList (path: file: ''
         mkdir -p "$out/$(dirname ${path})"
-        ln -s "${file}" "$out/${path}"
+        ${if path == "apps_groups.conf" then "cp" else "ln -s"} "${file}" "$out/${path}"
       '') cfg.configDir)}
   '';
 

nixos/tests/all-tests.nix

@@ -468,8 +468,8 @@ in {
   iftop = handleTest ./iftop.nix {};
   immich = handleTest ./web-apps/immich.nix {};
   incron = handleTest ./incron.nix {};
-  incus = pkgs.recurseIntoAttrs (handleTest ./incus { lts = false; });
-  incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { });
+  incus = pkgs.recurseIntoAttrs (handleTest ./incus { lts = false; inherit system pkgs; });
+  incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit system pkgs; });
   influxdb = handleTest ./influxdb.nix {};
   influxdb2 = handleTest ./influxdb2.nix {};
   initrd-network-openvpn = handleTestOn [ "x86_64-linux" "i686-linux" ] ./initrd-network-openvpn {};

nixos/tests/incus/default.nix

@@ -1,4 +1,7 @@
 {
+  system ? builtins.currentSystem,
+  config ? { },
+  pkgs ? import ../../.. { inherit system config; },
   lts ? true,
   ...
 }:
@@ -7,36 +10,40 @@ let
 in
 {
   all = incusTest {
-    inherit lts;
+    inherit lts pkgs system;
     allTests = true;
   };
 
   container = incusTest {
-    inherit lts;
+    inherit lts pkgs system;
     instanceContainer = true;
   };
 
   lvm = incusTest {
-    inherit lts;
+    inherit lts pkgs system;
     storageLvm = true;
   };
 
-  lxd-to-incus = import ./lxd-to-incus.nix { };
+  lxd-to-incus = import ./lxd-to-incus.nix {
+    inherit lts pkgs system;
+  };
 
   openvswitch = incusTest {
-    inherit lts;
+    inherit lts pkgs system;
     networkOvs = true;
   };
 
-  ui = import ./ui.nix { };
+  ui = import ./ui.nix {
+    inherit lts pkgs system;
+  };
 
   virtual-machine = incusTest {
-    inherit lts;
+    inherit lts pkgs system;
     instanceVm = true;
   };
 
   zfs = incusTest {
-    inherit lts;
+    inherit lts pkgs system;
     storageLvm = true;
   };
 }

nixos/tests/incus/incus-tests.nix

@@ -445,7 +445,7 @@ import ../make-test-python.nix (
                 machine.succeed("incus storage volume show lvm_pool test_fs")
                 machine.succeed("incus storage volume show lvm_pool test_vol")
 
-                machine.succeed("incus create lvm1 --empty --storage zfs_pool")
+                machine.succeed("incus create lvm1 --empty --storage lvm_pool")
                 machine.succeed("incus list lvm1")
           '';
   }

nixos/tests/incus/lxd-to-incus.nix

@@ -3,7 +3,7 @@ import ../make-test-python.nix (
   {
     pkgs,
     lib,
-    incus ? pkgs.incus-lts,
+    lts ? true,
     ...
   }:
 
@@ -21,7 +21,7 @@ import ../make-test-python.nix (
     };
 
     nodes.machine =
-      { lib, ... }:
+      { ... }:
       {
         virtualisation = {
           diskSize = 6144;
@@ -72,7 +72,7 @@ import ../make-test-python.nix (
 
           incus = {
             enable = true;
-            package = incus;
+            package = if lts then pkgs.incus-lts else pkgs.incus;
           };
         };
         networking.nftables.enable = true;

nixos/tests/incus/ui.nix

@@ -2,7 +2,7 @@ import ../make-test-python.nix (
   {
     pkgs,
     lib,
-    incus ? pkgs.incus-lts,
+    lts ? true,
     ...
   }:
   {
@@ -18,7 +18,7 @@ import ../make-test-python.nix (
         virtualisation = {
           incus = {
             enable = true;
-            package = incus;
+            package = if lts then pkgs.incus-lts else pkgs.incus;
           };
           incus.ui.enable = true;
         };

nixos/tests/netdata.nix

@@ -14,6 +14,10 @@ import ./make-test-python.nix ({ pkgs, ...} : {
           services.netdata = {
             enable = true;
             python.recommendedPythonPackages = true;
+
+            configDir."apps_groups.conf" = pkgs.writeText "apps_groups.conf" ''
+              netdata_test: netdata
+            '';
           };
         };
     };
@@ -33,12 +37,20 @@ import ./make-test-python.nix ({ pkgs, ...} : {
     # check if netdata can read disk ops for root owned processes.
     # if > 0, successful. verifies both netdata working and
     # apps.plugin has elevated capabilities.
-    url = "http://localhost:19999/api/v1/data\?chart=user.root_disk_physical_io"
+    url = "http://localhost:19999/api/v1/data?chart=user.root_disk_physical_io"
     filter = '[.data[range(10)][2]] | add | . < 0'
     cmd = f"curl -s {url} | jq -e '{filter}'"
     netdata.wait_until_succeeds(cmd)
 
     # check if the control socket is available
     netdata.succeed("sudo netdatacli ping")
+
+    # check that custom groups in apps_groups.conf are used.
+    # if > 0, successful. verifies that user-specified apps_group.conf
+    # is used.
+    url = "http://localhost:19999/api/v1/data?chart=app.netdata_test_cpu_utilization"
+    filter = '[.data[range(10)][2]] | add | . > 0'
+    cmd = f"curl -s {url} | jq -e '{filter}'"
+    netdata.wait_until_succeeds(cmd, timeout=30)
   '';
 })

pkgs/applications/editors/emacs/inhibit-lexical-cookie-warning-67916-30.patch

@@ -0,0 +1,30 @@
+From: Lin Jian <[email protected]>
+Bug: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=67916
+
+Inhibit lexical cookie warning for *-pkg.el files (bug#67916)
+
+Users may use byte-compile-error-on-warn to turn compilation warnings
+into errors to make sure their Emacs lisp packages are warning-free.
+Emacs bug 67916 makes that difficult because the Emacs-generated file
+*-pkg.el emits a compilation warning about missing lexical cookie.
+
+There is an upstream patch to fix this.  That patch makes Emacs also
+generate the needed lexical cookie when generating *-pkg.el files.
+However, that patch has stalled.
+
+This patch takes an easier but less accurate approach by inhibiting
+lexical cookie warning for *-pkg.el files.  Given that not all
+*-pkg.el files are generated by Emacs, to reduce impact, this patch
+also checks no-byte-compile.
+
+--- a/lisp/emacs-lisp/bytecomp.el
++++ b/lisp/emacs-lisp/bytecomp.el
+@@ -2266,6 +2266,8 @@ See also `emacs-lisp-byte-compile-and-load'."
+               filename buffer-file-name))
+       ;; Don't inherit lexical-binding from caller (bug#12938).
+       (unless (or (local-variable-p 'lexical-binding)
++                  (and (string-suffix-p "-pkg.el" filename)
++                       (with-current-buffer input-buffer no-byte-compile))
+                   bytecomp--inhibit-lexical-cookie-warning)
+         (let ((byte-compile-current-buffer (current-buffer)))
+           (displaying-byte-compile-warnings

pkgs/applications/editors/emacs/sources.nix

@@ -150,6 +150,12 @@ in
     variant = "mainline";
     rev = "30.0.93";
     hash = "sha256-lcpB4lKD3tjvCn646hUyAskxWNCQwEJ0RX/ZddRBRRU=";
+    patches = fetchpatch: [
+      (builtins.path {
+        name = "inhibit-lexical-cookie-warning-67916.patch";
+        path = ./inhibit-lexical-cookie-warning-67916-30.patch;
+      })
+    ];
   });
 
   emacs28-macport = import ./make-emacs.nix (mkArgs {