calamares: 3.3.9 -> 3.3.10. calamares-nixos-extensions: 3.3.18 -> 3.3.19 (#352694)

pkgs/tools/misc/calamares-nixos-extensions/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "calamares-nixos-extensions";
-  version = "0.3.18";
+  version = "0.3.19";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "calamares-nixos-extensions";
     rev = finalAttrs.version;
-    hash = "sha256-j+9iZtw9QIKHLo5sr9nkCVoZS7QQCnDDyTGFXD+R+WU=";
+    hash = "sha256-/WdSMqtF8DKplsDx00l8HYijYvOUBb55Opv3Z8+T6QU=";
   };
 
   installPhase = ''

pkgs/tools/misc/calamares/0007-Fix-setting-the-kayboard-layout-on-GNOME-wayland.patch

@@ -1,23 +1,22 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Victor Fuentes <vmfuentes64@gmail.com>
-Date: Thu, 1 Aug 2024 16:03:14 -0400
+Date: Thu, 31 Oct 2024 10:34:25 -0700
 Subject: [PATCH] Fix setting the kayboard layout on GNOME wayland.
 
 By default the module uses the setxkbmap, which will not change the
 keyboard
 ---
- src/modules/keyboard/Config.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
+ src/modules/keyboard/Config.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
 
 diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
-index ad6bee6f7..4d43abe53 100644
+index 54ee7649c..60fe2d7d0 100644
 --- a/src/modules/keyboard/Config.cpp
 +++ b/src/modules/keyboard/Config.cpp
-@@ -307,7 +307,10 @@ Config::xkbApply()
-                            xkbmap_layout_args( { m_additionalLayoutInfo.additionalLayout, m_selectedLayout },
-                                                { m_additionalLayoutInfo.additionalVariant, m_selectedVariant },
-                                                m_additionalLayoutInfo.groupSwitcher ) );
--
+@@ -306,6 +306,10 @@ Config::applyXkb()
+                                                   m_additionalLayoutInfo.groupSwitcher ) );
+         QProcess::execute( "setxkbmap", basicArguments );
+ 
 +        QString xkbmap = QString( "[('xkb','%1\%2'),('xkb','%3\%4')]").arg(
 +                                  m_selectedLayout, ((!m_selectedVariant.isEmpty()) ? "+" + m_selectedVariant : ""),
 +                                  m_additionalLayoutInfo.additionalLayout, ((!m_additionalLayoutInfo.additionalVariant.isEmpty()) ? "+" + m_additionalLayoutInfo.additionalVariant : ""));
@@ -25,12 +24,12 @@ index ad6bee6f7..4d43abe53 100644
          cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant << "(added "
                   << m_additionalLayoutInfo.additionalLayout << "-" << m_additionalLayoutInfo.additionalVariant
                   << " since current layout is not ASCII-capable)";
-@@ -315,6 +318,8 @@ Config::xkbApply()
-     else
+@@ -314,6 +318,8 @@ Config::applyXkb()
      {
-         QProcess::execute( "setxkbmap", xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
+         basicArguments.append( xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
+         QProcess::execute( "setxkbmap", basicArguments );
 +        QString xkbmap = QString( "[('xkb','%1\%2')]").arg( m_selectedLayout, ((!m_selectedVariant.isEmpty()) ? "+" + m_selectedVariant : "") );
 +        QProcess::execute( "sh", { "-c", "if command -v gsettings; then gsettings set org.gnome.desktop.input-sources sources \"$0\"; fi", xkbmap });
          cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
      }
-     m_setxkbmapTimer.disconnect( this );
+     m_applyTimer.stop();

pkgs/tools/misc/calamares/default.nix

@@ -7,12 +7,12 @@
 
 mkDerivation rec {
   pname = "calamares";
-  version = "3.3.9";
+  version = "3.3.10";
 
   # release including submodule
   src = fetchurl {
     url = "https://github.com/calamares/calamares/releases/download/v${version}/calamares-${version}.tar.gz";
-    sha256 = "sha256-2PcPpoLKcy9EjHAz5mxdT3RxYQMfdPRneOIHKM7/a0U=";
+    sha256 = "sha256-iBf8APBLNOpntyn+9WQWl+j8oQ4iR3pOwbcZlK86g5Q=";
   };
 
   # On major changes, or when otherwise required, you *must* :