Merge master into staging-next

Author: nixpkgs-ci[bot]

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

@@ -256,6 +256,8 @@
 - `kmonad` is now hardened by default using common `systemd` settings.
   If KMonad is used to execute shell commands, hardening may make some of them fail.  In that case, you can disable hardening using {option}`services.kmonad.keyboards.<name>.enableHardening` option.
 
+- `isd` was updated from 0.2.0 to 0.5.1, the new version may crash with a previously generated config, try moving or deleting `~/.config/isd/schema.json`.
+
 - `asusd` has been upgraded to version 6 which supports multiple aura devices. To account for this, the single `auraConfig` configuration option has been replaced with `auraConfigs` which is an attribute set of config options per each device. The config files may also be now specified as either source files or text strings; to account for this you will need to specify that `text` is used for your existing configs, e.g.:
   ```diff
   -services.asusd.asusdConfig = '''file contents'''

nixos/modules/services/databases/mysql.nix

@@ -433,6 +433,25 @@ in
             done
           ''}
 
+          ${lib.optionalString isMariaDB ''
+            # If MariaDB is used in an Galera cluster, we have to check if the sync is done,
+            # or it will fail to init the database while joining, so we get in an broken non recoverable state
+            # so we wait until we have an synced state
+            if ${cfg.package}/bin/mysql -u ${superUser} -N -e "SHOW VARIABLES LIKE 'wsrep_on'" 2>/dev/null | ${lib.getExe' pkgs.gnugrep "grep"} -q 'ON'; then
+              echo "Galera cluster detected, waiting for node to be synced..."
+              while true; do
+                STATE=$(${cfg.package}/bin/mysql -u ${superUser} -N -e "SHOW STATUS LIKE 'wsrep_local_state_comment'" | ${lib.getExe' pkgs.gawk "awk"} '{print $2}')
+                if [ "$STATE" = "Synced" ]; then
+                  echo "Node is synced"
+                  break
+                else
+                  echo "Current state: $STATE - Waiting for 1 second..."
+                  sleep 1
+                fi
+              done
+            fi
+          ''}
+
           if [ -f ${cfg.dataDir}/mysql_init ]
           then
               # While MariaDB comes with a 'mysql' super user account since 10.4.x, MySQL does not
@@ -447,10 +466,10 @@ in
                 # Create initial databases
                 if ! test -e "${cfg.dataDir}/${database.name}"; then
                     echo "Creating initial database: ${database.name}"
-                    ( echo 'create database `${database.name}`;'
+                    ( echo 'CREATE DATABASE IF NOT EXISTS `${database.name}`;'
 
                       ${lib.optionalString (database.schema != null) ''
-                        echo 'use `${database.name}`;'
+                        echo 'USE `${database.name}`;'
 
                         # TODO: this silently falls through if database.schema does not exist,
                         # we should catch this somehow and exit, but can't do it here because we're in a subshell.
@@ -469,7 +488,7 @@ in
               ${lib.optionalString (cfg.replication.role == "master") ''
                 # Set up the replication master
 
-                ( echo "use mysql;"
+                ( echo "USE mysql;"
                   echo "CREATE USER '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' IDENTIFIED WITH mysql_native_password;"
                   echo "SET PASSWORD FOR '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}' = PASSWORD('${cfg.replication.masterPassword}');"
                   echo "GRANT REPLICATION SLAVE ON *.* TO '${cfg.replication.masterUser}'@'${cfg.replication.slaveHost}';"
@@ -479,9 +498,9 @@ in
               ${lib.optionalString (cfg.replication.role == "slave") ''
                 # Set up the replication slave
 
-                ( echo "stop slave;"
-                  echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';"
-                  echo "start slave;"
+                ( echo "STOP SLAVE;"
+                  echo "CHANGE MASTER TO MASTER_HOST='${cfg.replication.masterHost}', MASTER_USER='${cfg.replication.masterUser}', MASTER_PASSWORD='${cfg.replication.masterPassword}';"
+                  echo "START SLAVE;"
                 ) | ${cfg.package}/bin/mysql -u ${superUser} -N
               ''}
 

pkgs/applications/graphics/processing/default.nix

@@ -16,7 +16,7 @@
   libGL,
 }:
 let
-  buildNumber = "1294";
+  buildNumber = "1295";
   vaqua = fetchurl {
     name = "VAqua9.jar";
     url = "https://violetlib.org/release/vaqua/9/VAqua9.jar";
@@ -61,15 +61,19 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "processing";
-  version = "4.3.1";
+  version = "4.3.2";
 
   src = fetchFromGitHub {
     owner = "processing";
     repo = "processing4";
     rev = "processing-${buildNumber}-${version}";
-    sha256 = "sha256-nshhPeDXhrvk+2oQ9BPqJTZV9a+OjxeQiO31JAxQ40g=";
+    sha256 = "sha256-jUkWnkP8up5vpaXfgFJ/jQjN1KfeX5EuYXSb+W6NEms=";
   };
 
+  # Processing did not update the todo.txt file before tagging this release, so
+  # the "revision-check" Ant target fails.
+  patches = [ ./disable-revision-check.patch ];
+
   nativeBuildInputs = [
     ant
     unzip

pkgs/applications/graphics/processing/disable-revision-check.patch

@@ -0,0 +1,13 @@
+diff --git a/build/build.xml b/build/build.xml
+index 8ad556c11..e61b6ae45 100644
+--- a/build/build.xml
++++ b/build/build.xml
+@@ -453,8 +453,6 @@
+ 
+     <!-- the revision.base property won't be set
+          if $revision wasn't found... -->
+-    <fail unless="revision.correct"
+-          message="Fix revision number in Base.java" />
+   </target>
+ 
+ 

pkgs/by-name/bu/buf/package.nix

@@ -40,6 +40,10 @@ buildGoModule rec {
   ];
 
   preCheck = ''
+    # Some tests take longer depending on builder load.
+    substituteInPlace private/bufpkg/bufcheck/lint_test.go \
+      --replace-fail 'context.WithTimeout(context.Background(), 60*time.Second)' \
+                     'context.WithTimeout(context.Background(), 600*time.Second)'
     # For WebAssembly runtime tests
     GOOS=wasip1 GOARCH=wasm go build -o $GOPATH/bin/buf-plugin-suffix.wasm \
       ./private/bufpkg/bufcheck/internal/cmd/buf-plugin-suffix

pkgs/by-name/hy/hyprswitch/package.nix

@@ -0,0 +1,41 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  wrapGAppsHook4,
+  gtk4-layer-shell,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "hyprswitch";
+  version = "3.3.2";
+
+  src = fetchFromGitHub {
+    owner = "H3rmt";
+    repo = "hyprswitch";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-cmo544QvdacVTHPqmc6er4xnSSc63e6Z71BS0FxSklE=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-DEifup2oAcqZplx2JoN3hkP1VmxwYVFS8ZqfpR80baA=";
+
+  nativeBuildInputs = [
+    wrapGAppsHook4
+    pkg-config
+  ];
+
+  buildInputs = [
+    gtk4-layer-shell
+  ];
+
+  meta = {
+    description = "CLI/GUI that allows switching between windows in Hyprland";
+    mainProgram = "hyprswitch";
+    homepage = "https://github.com/H3rmt/hyprswitch";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ arminius-smh ];
+  };
+})

pkgs/by-name/is/isd/package.nix

@@ -7,18 +7,19 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "isd";
-  version = "0.2.0";
+  version = "0.5.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "isd-project";
     repo = "isd";
     tag = "v${version}";
-    hash = "sha256-YOQoI9PB096C/wNF9y5nrXkpJGbO6cXQ2U6I2Ece2PM=";
+    hash = "sha256-z9lyPSiuUAwu5bmZlcHj5SV3mHtP+GXtuEeJzOr1c9A=";
   };
 
   build-system = with python3Packages; [
     hatchling
+    setuptools
   ];
 
   dependencies = with python3Packages; [
@@ -38,7 +39,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   pythonImportsCheck = [
-    "isd"
+    "isd_tui"
   ];
 
   passthru.updateScript = nix-update-script { };

pkgs/by-name/li/libvirt-glib/package.nix

@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with lib; {
-    description = "Library for working with virtual machines";
+    description = "Wrapper library of libvirt for glib-based applications";
     longDescription = ''
       libvirt-glib wraps libvirt to provide a high-level object-oriented API better
       suited for glib-based applications, via three libraries: