Merge branch 'main' into next

Author: nlogozzo

.github/workflows/windows.yml

@@ -38,7 +38,7 @@ jobs:
           $ProgressPreference = 'SilentlyContinue'
           mkdir build
           mkdir build-portable
-          Invoke-WebRequest https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.25-v1.17/gettext0.25-iconv1.17-shared-64.zip -OutFile gettext.zip
+          Invoke-WebRequest https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.26-v1.17/gettext0.26-iconv1.17-shared-64.zip -OutFile gettext.zip
           Invoke-WebRequest https://files.jrsoftware.org/is/6/innosetup-6.5.1.exe -OutFile innosetup.exe
           Expand-Archive -Force 'gettext.zip'
           move gettext\bin\* C:\Windows\System32
@@ -51,9 +51,9 @@ jobs:
         with:
           pkgs: libnick
           triplet: ${{ matrix.variant.triplet }}
-          revision: 3c49e92d66d8eb4505d7f18d8c461240f55c08b0
+          revision: b1e15efef6758eaa0beb0a8732cfa66f6a68a81d
           token: ${{ github.token }}
-          cache-key: ${{ matrix.variant.triplet }}-3c49e92d66d8eb4505d7f18d8c461240f55c08b0
+          cache-key: ${{ matrix.variant.triplet }}-b1e15efef6758eaa0beb0a8732cfa66f6a68a81d
       - name: "Build (Installer)"
         working-directory: ${{ github.workspace }}/build
         run: |