zvbi: fix darwin build

doc/redirects.json

@@ -788,6 +788,9 @@
   "var-stdenv-depsTargetTargetPropagated": [
     "index.html#var-stdenv-depsTargetTargetPropagated"
   ],
+  "var-stdenv-strictDeps": [
+    "index.html#var-stdenv-strictDeps"
+  ],
   "ssec-stdenv-attributes": [
     "index.html#ssec-stdenv-attributes"
   ],

doc/stdenv/stdenv.chapter.md

@@ -487,6 +487,14 @@ The propagated equivalent of `buildInputs`. This would be called `depsHostTarget
 
 The propagated equivalent of `depsTargetTarget`. This is prefixed for the same reason of alerting potential users.
 
+##### `strictDeps` {#var-stdenv-strictDeps}
+
+When using native compilation, `stdenv` is lenient towards incorrect placement of a dependency into one of the dependency lists described above. That means a dependency needed at runtime often works, even if it is only present in `nativeBuildInputs`. Vice-versa, dependencies containing binaries that need to be executed during the build will work even if they are only listed in `buildInputs`.
+
+While convenient for getting to a package quickly, this behavior can break cross-compilation. Adding `strictDeps = true` as a parameter to `mkDerivation` or any of its language specific wrappers disables this behavior.
+
+The specialized `build*` functions for dlang, emacs, go, nim, ocaml, python, and rust enable this option by default.
+
 ## Attributes {#ssec-stdenv-attributes}
 
 ### Variables affecting `stdenv` initialisation {#variables-affecting-stdenv-initialisation}

maintainers/maintainer-list.nix

@@ -17478,6 +17478,12 @@
     name = "Maciej Krüger";
     keys = [ { fingerprint = "E90C BA34 55B3 6236 740C  038F 0D94 8CE1 9CF4 9C5F"; } ];
   };
+  mkleczek = {
+    name = "Michal Kleczek";
+    email = "michal@kleczek.org";
+    github = "mkleczek";
+    githubId = 11559480;
+  };
   mksafavi = {
     name = "MK Safavi";
     email = "mksafavi@gmail.com";

nixos/doc/manual/release-notes/rl-2605.section.md

@@ -70,3 +70,5 @@ of pulling the upstream container image from Docker Hub. If you want the old beh
 - `services.frp` now supports multiple instances through `services.frp.instances` to make it possible to run multiple frp clients or servers at the same time.
 
 - `services.openssh` now supports generating host SSH keys by setting `services.openssh.generateHostKeys = true` while leaving `services.openssh.enable` disabled.  This is particularly useful for systems that have no need of an SSH daemon but want SSH host keys for other purposes such as using agenix or sops-nix.
+
+- `services.slurm` now supports slurmrestd usage through the `services.slurm.rest` NixOS options.

nixos/modules/services/computing/slurm/slurm.nix

@@ -130,6 +130,45 @@ in
         enable = lib.mkEnableOption "slurm client daemon";
       };
 
+      rest = {
+        enable = lib.mkEnableOption "slurm REST daemon";
+
+        options = lib.mkOption {
+          type = lib.types.str;
+          default = "";
+          description = "Extra command-line options to pass to slurmrestd.";
+        };
+
+        environment = lib.mkOption {
+          default = { };
+          description = "Environment variables to set for the slurmrestd daemon, see slurmrestd(8).";
+          type = lib.types.submodule {
+            freeformType = with lib.types; attrsOf str;
+            options = {
+              SLURM_JWT = lib.mkOption {
+                type = lib.types.str;
+                default = "daemon";
+                description = "This variable must be set to use JWT token authentication.";
+              };
+              SLURMRESTD_LISTEN = lib.mkOption {
+                type = lib.types.str;
+                default = ":6820";
+                description = "Comma-delimited list of host:port pairs or unix sockets to listen on.";
+              };
+              SLURMRESTD_DEBUG = lib.mkOption {
+                type = lib.types.str;
+                default = "info";
+                description = ''
+                  Set debug level explicitly. Valid values are 0-9, or the same
+                  string values as the debug options such as SlurmctldDebug in
+                  slurm.conf(5).
+                '';
+              };
+            };
+          };
+        };
+      };
+
       enableStools = lib.mkOption {
         type = lib.types.bool;
         default = false;
@@ -359,131 +398,174 @@ in
       '';
 
     in
-    lib.mkIf (cfg.enableStools || cfg.client.enable || cfg.server.enable || cfg.dbdserver.enable) {
+    lib.mkIf
+      (
+        cfg.enableStools
+        || cfg.client.enable
+        || cfg.server.enable
+        || cfg.dbdserver.enable
+        || cfg.rest.enable
+      )
+      {
+
+        environment.systemPackages = [ wrappedSlurm ];
+
+        services.munge.enable = lib.mkDefault true;
+
+        # use a static uid as default to ensure it is the same on all nodes
+        users.users.slurm = lib.mkIf (cfg.user == defaultUser) {
+          name = defaultUser;
+          group = "slurm";
+          uid = config.ids.uids.slurm;
+        };
 
-      environment.systemPackages = [ wrappedSlurm ];
+        users.groups.slurm.gid = config.ids.uids.slurm;
 
-      services.munge.enable = lib.mkDefault true;
+        users.users.slurmrestd = lib.mkIf (cfg.rest.enable) {
+          name = "slurmrestd";
+          group = "slurmrestd";
+          isSystemUser = true;
+        };
 
-      # use a static uid as default to ensure it is the same on all nodes
-      users.users.slurm = lib.mkIf (cfg.user == defaultUser) {
-        name = defaultUser;
-        group = "slurm";
-        uid = config.ids.uids.slurm;
-      };
+        users.groups.slurmrestd = lib.mkIf (cfg.rest.enable) { };
 
-      users.groups.slurm.gid = config.ids.uids.slurm;
+        systemd.services.slurmd = lib.mkIf (cfg.client.enable) {
+          path =
+            with pkgs;
+            [
+              wrappedSlurm
+              coreutils
+            ]
+            ++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
 
-      systemd.services.slurmd = lib.mkIf (cfg.client.enable) {
-        path =
-          with pkgs;
-          [
-            wrappedSlurm
-            coreutils
-          ]
-          ++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
-
-        wantedBy = [ "multi-user.target" ];
-        after = [
-          "systemd-tmpfiles-clean.service"
-          "munge.service"
-          "network-online.target"
-          "remote-fs.target"
-        ];
-        wants = [ "network-online.target" ];
-
-        serviceConfig = {
-          Type = "forking";
-          KillMode = "process";
-          ExecStart = "${wrappedSlurm}/bin/slurmd";
-          PIDFile = "/run/slurmd.pid";
-          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-          LimitMEMLOCK = "infinity";
-          Delegate = "Yes";
+          wantedBy = [ "multi-user.target" ];
+          after = [
+            "systemd-tmpfiles-clean.service"
+            "munge.service"
+            "network-online.target"
+            "remote-fs.target"
+          ];
+          wants = [ "network-online.target" ];
+
+          serviceConfig = {
+            Type = "forking";
+            KillMode = "process";
+            ExecStart = "${wrappedSlurm}/bin/slurmd";
+            PIDFile = "/run/slurmd.pid";
+            ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+            LimitMEMLOCK = "infinity";
+            Delegate = "Yes";
+          };
         };
-      };
 
-      systemd.tmpfiles.rules = lib.optionals cfg.client.enable [
-        "d /var/spool/slurmd 755 root root -"
-        "d ${cfg.mpi.PmixCliTmpDirBase} 755 root root -"
-      ];
+        systemd.tmpfiles.rules = lib.optionals cfg.client.enable [
+          "d /var/spool/slurmd 755 root root -"
+          "d ${cfg.mpi.PmixCliTmpDirBase} 755 root root -"
+        ];
 
-      services.openssh.settings.X11Forwarding = lib.mkIf cfg.client.enable (lib.mkDefault true);
+        services.openssh.settings.X11Forwarding = lib.mkIf cfg.client.enable (lib.mkDefault true);
 
-      systemd.services.slurmctld = lib.mkIf (cfg.server.enable) {
-        path =
-          with pkgs;
-          [
-            wrappedSlurm
-            munge
-            coreutils
-          ]
-          ++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
+        systemd.services.slurmctld = lib.mkIf (cfg.server.enable) {
+          path =
+            with pkgs;
+            [
+              wrappedSlurm
+              munge
+              coreutils
+            ]
+            ++ lib.optional cfg.enableSrunX11 slurm-spank-x11;
 
-        wantedBy = [ "multi-user.target" ];
-        after = [
-          "network.target"
-          "munged.service"
-        ];
-        requires = [ "munged.service" ];
+          wantedBy = [ "multi-user.target" ];
+          after = [
+            "network.target"
+            "munged.service"
+          ];
+          requires = [ "munged.service" ];
+
+          serviceConfig = {
+            Type = "forking";
+            ExecStart = "${wrappedSlurm}/bin/slurmctld";
+            PIDFile = "/run/slurmctld.pid";
+            ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+          };
 
-        serviceConfig = {
-          Type = "forking";
-          ExecStart = "${wrappedSlurm}/bin/slurmctld";
-          PIDFile = "/run/slurmctld.pid";
-          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+          preStart = ''
+            mkdir -p ${cfg.stateSaveLocation}
+            chown -R ${cfg.user}:slurm ${cfg.stateSaveLocation}
+          '';
         };
 
-        preStart = ''
-          mkdir -p ${cfg.stateSaveLocation}
-          chown -R ${cfg.user}:slurm ${cfg.stateSaveLocation}
-        '';
-      };
+        systemd.services.slurmdbd =
+          let
+            # slurm strips the last component off the path
+            configPath = "$RUNTIME_DIRECTORY/slurmdbd.conf";
+          in
+          lib.mkIf (cfg.dbdserver.enable) {
+            path = with pkgs; [
+              wrappedSlurm
+              munge
+              coreutils
+            ];
+
+            wantedBy = [ "multi-user.target" ];
+            after = [
+              "network.target"
+              "munged.service"
+              "mysql.service"
+            ];
+            requires = [
+              "munged.service"
+              "mysql.service"
+            ];
+
+            preStart = ''
+              install -m 600 -o ${cfg.user} -T ${slurmdbdConf} ${configPath}
+              ${lib.optionalString (cfg.dbdserver.storagePassFile != null) ''
+                echo "StoragePass=$(cat ${cfg.dbdserver.storagePassFile})" \
+                  >> ${configPath}
+              ''}
+            '';
+
+            script = ''
+              export SLURM_CONF=${configPath}
+              exec ${cfg.package}/bin/slurmdbd -D
+            '';
+
+            serviceConfig = {
+              RuntimeDirectory = "slurmdbd";
+              Type = "simple";
+              PIDFile = "/run/slurmdbd.pid";
+              ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+            };
+          };
 
-      systemd.services.slurmdbd =
-        let
-          # slurm strips the last component off the path
-          configPath = "$RUNTIME_DIRECTORY/slurmdbd.conf";
-        in
-        lib.mkIf (cfg.dbdserver.enable) {
+        systemd.services.slurmrestd = lib.mkIf (cfg.rest.enable) {
           path = with pkgs; [
             wrappedSlurm
-            munge
             coreutils
           ];
 
           wantedBy = [ "multi-user.target" ];
           after = [
-            "network.target"
-            "munged.service"
-            "mysql.service"
-          ];
-          requires = [
-            "munged.service"
-            "mysql.service"
+            "systemd-tmpfiles-clean.service"
+            "network-online.target"
+            "remote-fs.target"
+            "slurmctld.service"
           ];
-
-          preStart = ''
-            install -m 600 -o ${cfg.user} -T ${slurmdbdConf} ${configPath}
-            ${lib.optionalString (cfg.dbdserver.storagePassFile != null) ''
-              echo "StoragePass=$(cat ${cfg.dbdserver.storagePassFile})" \
-                >> ${configPath}
-            ''}
-          '';
-
-          script = ''
-            export SLURM_CONF=${configPath}
-            exec ${cfg.package}/bin/slurmdbd -D
-          '';
+          wants = [ "network-online.target" ];
 
           serviceConfig = {
-            RuntimeDirectory = "slurmdbd";
             Type = "simple";
-            PIDFile = "/run/slurmdbd.pid";
+            ExecStart = "${wrappedSlurm}/bin/slurmrestd ${cfg.rest.options}";
+            PIDFile = "/run/slurmrestd.pid";
             ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+            LimitMEMLOCK = "infinity";
+            User = "slurmrestd";
+            Group = "slurmrestd";
           };
-        };
 
-    };
+          environment = cfg.rest.environment;
+        };
+      };
 
 }

nixos/modules/services/desktop-managers/plasma6.nix

@@ -167,6 +167,7 @@ in
           spectacle
           ffmpegthumbs
           krdp
+          kconfig # required for xdg-terminal from xdg-utils
         ]
         ++ lib.optionals config.hardware.sensor.iio.enable [
           # This is required for autorotation in Plasma 6