@@ -538,0 +597,4 @@
+            msys2.wine-msys2
+          ];
+        };
+        installer = pkgs.mkShell {

@@ -0,0 +445,4 @@
+    })
+
+    (pkgs.fetchurl {
+      url = "https://msys2.m-labs.hk/artiq-beta/mingw-w64-x86_64-python-sipyco-1.6-1-any.pkg.tar.zst";

@@ -0,0 +1,102 @@
+#

@@ -0,0 +7,4 @@
+mkdir -p $MSYS2DIR/var/lib/pacman $MSYS2DIR/msys/etc
+
+curl -L https://repo.msys2.org/msys/x86_64/pacman-mirrors-20240210-1-any.pkg.tar.zst | tar xvf - -C $MSYS2DIR --zstd
+curl -L https://raw.githubusercontent.com/msys2/MSYS2-packages/master/pacman/pacman.conf | sed -e "s|/etc/pacman.d|$MSYS2DIR/etc/pacman.d|g" -e "s|SigLevel    = Required|SigLevel    = Never|g" > $MSYS2DIR/etc/pacman.conf

@@ -526,0 +571,4 @@
+                   -p "qt-ifw/packages" \
+                   -c "qt-ifw/config/config.xml" \
+                   --offline-only \
+                   "msys2-x86_64.exe" \

@@ -526,0 +562,4 @@
+             export HOME=`mktemp -d`
+             cp -r $src/installer/qt-ifw qt-ifw
+             chmod -R 700 qt-ifw
+             find qt-ifw \( -name "package.xml" -or -name "config.xml" \) -exec sed -i "s|@DATE@|$(date +'%Y-%m-%d')|g" "{}" \;

@@ -526,0 +561,4 @@
+          buildPhase = ''
+             export HOME=`mktemp -d`
+             cp -r $src/installer/qt-ifw qt-ifw
+             chmod -R 700 qt-ifw

@@ -8,0 +14,4 @@
+nix build .#hydraJobs.msys2-offline-installer
+```
+
+Update packages if needed:

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash

@@ -526,0 +536,4 @@
+            installPhase = (pkgs.lib.strings.concatStringsSep "\n" (["mkdir $out"] ++ (map (p: "tar xvf ${p} -C $out") srcs)));
+          };
+
+          msys2_image = pkgs.stdenvNoCC.mkDerivation rec {

@@ -538,0 +601,4 @@
+            fakeroot
+            p7zip
+            msys2.wine-msys2
+            wine64

@@ -0,0 +37,4 @@
+    component.addOperation("CreateShortcut", "@TargetDir@/mingw32.exe", "@StartMenuDir@/MSYS2 MINGW32.lnk", "iconPath=@TargetDir@/mingw32.exe");
+    component.addOperation("CreateShortcut", "@TargetDir@/mingw64.exe", "@StartMenuDir@/MSYS2 MINGW64.lnk", "iconPath=@TargetDir@/mingw64.exe");
+    component.addOperation("CreateShortcut", "@TargetDir@/ucrt64.exe", "@StartMenuDir@/MSYS2 UCRT64.lnk", "iconPath=@TargetDir@/ucrt64.exe");
+    component.addOperation("CreateShortcut", "@TargetDir@/clang64.exe", "@StartMenuDir@/MSYS2 CLANG64.lnk", "iconPath=@TargetDir@/clang64.exe");

@@ -24,1 +20,3 @@
-echo "]" >> msys2_packages.nix
+pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \
+  --cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" \
+  mingw-w64-x86_64-python\

@@ -25,0 +37,4 @@
+  mingw-w64-x86_64-lld \
+  mingw-w64-x86_64-python-aiohttp \
+  mingw-w64-x86_64-python-idna \
+  mingw-w64-x86_64-python-yarl \

@@ -19,0 +22,4 @@
+      openocdDependenciesFile = ./msys2/openocd_deps.txt;
+      pythonparserDependenciesFile = ./msys2/pythonparser_deps.txt;
+      # reads filename and return list of non-empty lines from it
+      nonEmptyLinesFileReader = (filename: builtins.filter (x: builtins.lessThan 0 (builtins.length (pkgs.lib.strings.stringToCharacters x)))

@@ -0,0 +1,2 @@
+mingw-w64-x86_64-openocd

@@ -19,0 +22,4 @@
+      openocdDependenciesFile = ./msys2/openocd_deps.txt;
+      pythonparserDependenciesFile = ./msys2/pythonparser_deps.txt;
+      # reads filename and return list of non-empty lines from it
+      readPackagesFromFile = (filename: builtins.filter (x: builtins.lessThan 0 (builtins.length (pkgs.lib.strings.stringToCharacters x)))

@@ -526,0 +527,4 @@
+            installPhase = (pkgs.lib.strings.concatStringsSep "\n" (["mkdir $out"] ++ (map (p: "tar xvf ${p} -C $out") srcs)));
+          };
+
+          msys2_artiq_image = pkgs.stdenvNoCC.mkDerivation rec {

@@ -4,21 +4,40 @@ set -e
 
 cd $(dirname $0)
 MSYS2DIR=`pwd`/msys2
+rm -rf $MSYS2DIR

@@ -4,21 +4,40 @@ set -e
 
 cd $(dirname $0)
 MSYS2DIR=`pwd`/msys2
+rm -rf $MSYS2DIR

@@ -13,1 +15,3 @@
-pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf --cachedir $MSYS2DIR/msys/cache -Sp mingw-w64-x86_64-cc mingw-w64-x86_64-python3.11 mingw-w64-x86_64-python-numpy mingw-w64-x86_64-python-setuptools > $MSYS2DIR/packages.txt
+pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \
+  --cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" \
+  mingw-w64-x86_64-cc mingw-w64-x86_64-python3.11 \

@@ -12,2 +14,3 @@
 fakeroot pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf -Syy
-pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf --cachedir $MSYS2DIR/msys/cache -Sp mingw-w64-x86_64-cc mingw-w64-x86_64-python3.11 mingw-w64-x86_64-python-numpy mingw-w64-x86_64-python-setuptools > $MSYS2DIR/packages.txt
+pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \
+  --cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" \

@@ -526,0 +517,4 @@
+
+        msys2-offline-installer = pkgs.stdenv.mkDerivation {
+          name = "msys2-installer";
+          buildInputs = with pkgs; [ curl pacman fakeroot p7zip wine64 ];