diff --git a/flake.nix b/flake.nix index a1c1b31..ca26cd3 100644 --- a/flake.nix +++ b/flake.nix @@ -454,6 +454,7 @@ "mingw-w64-x86_64-python-levenshtein" "mingw-w64-x86_64-lld" "mingw-w64-x86_64-artiq-comtools" + "mingw-w64-x86_64-python-lmdb" ]; }; msys2-asyncserial = msys2.makeMsys2Package { diff --git a/msys2/make_msys2_packages.sh b/msys2/make_msys2_packages.sh index 6f766af..9993e34 100755 --- a/msys2/make_msys2_packages.sh +++ b/msys2/make_msys2_packages.sh @@ -6,11 +6,11 @@ cd $(dirname $0) MSYS2DIR=`pwd`/msys2 mkdir -p $MSYS2DIR/var/lib/pacman $MSYS2DIR/msys/etc -curl -L https://mirror.msys2.org/msys/x86_64/pacman-mirrors-20220205-1-any.pkg.tar.zst | tar xvf - -C $MSYS2DIR --zstd +curl -L https://mirror.msys2.org/msys/x86_64/pacman-mirrors-20221016-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 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.10 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 -Sp mingw-w64-x86_64-cc mingw-w64-x86_64-python3.10 mingw-w64-x86_64-python-numpy mingw-w64-x86_64-python-setuptools mingw-w64-x86_64-python-lmdb > $MSYS2DIR/packages.txt echo "{ pkgs } : [" > msys2_packages.nix while read package; do diff --git a/msys2/msys2_packages.nix b/msys2/msys2_packages.nix index 3de9fb8..07c1b68 100644 --- a/msys2/msys2_packages.nix +++ b/msys2/msys2_packages.nix @@ -6,8 +6,8 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-12.2.0-10-any.pkg.tar.zst"; - sha256 = "1hql9jmmcpdr97p2ynj45hb70az4l41hcirjk0j1xjg31m2jgfr9"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libs-13.1.0-4-any.pkg.tar.zst"; + sha256 = "0k7ipnm1pzb8a2nkzsslihmr79c9aa6bsp7in0pnbh3wsmp8j7wd"; }) (pkgs.fetchurl { @@ -36,8 +36,8 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-isl-0.25-1-any.pkg.tar.zst"; - sha256 = "0hky9gmd6iz1s3irmp9fk2j10cpqrrw8l810riwr58ynj3i10j2k"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-isl-0.26-1-any.pkg.tar.zst"; + sha256 = "0hfycibi23xkah9sw60n4ka786l8vmlc67d2waw9mwqqljdmx7pr"; }) (pkgs.fetchurl { @@ -46,8 +46,8 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpfr-4.2.0-1-any.pkg.tar.zst"; - sha256 = "1iqpk6i5isf77rmvscmdv1ggrnhbvbfc3g4cyc6xgbp99s616724"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-mpfr-4.2.0.p4-1-any.pkg.tar.zst"; + sha256 = "1w46d3d0hvnlw7zc7r3wv7lx8ik8m12hm9pi7k6mbqx1387ljahs"; }) (pkgs.fetchurl { @@ -71,8 +71,8 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-12.2.0-10-any.pkg.tar.zst"; - sha256 = "182560g1bl52260v8dbggybl4mir3isyad22zvkb6sndid3iaakw"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-13.1.0-4-any.pkg.tar.zst"; + sha256 = "1rrj4pvajhhxdq2jplz8vqky7l9l4vzfdc7l90pfk4ygyslafsig"; }) (pkgs.fetchurl { @@ -131,8 +131,8 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tcl-8.6.12-1-any.pkg.tar.zst"; - sha256 = "0z66xic67k3j56jvvrwn8sym5yxylyza7ig686z5937nsd29kdw1"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-tcl-8.6.12-2-any.pkg.tar.zst"; + sha256 = "17lyrkyh76lh0ghk19d91kwicms6lxshhhb6n3zh748awfvihknm"; }) (pkgs.fetchurl { @@ -146,8 +146,8 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-xz-5.4.2-1-any.pkg.tar.zst"; - sha256 = "0w63y7rg76jnzy7ijhda1jzi9jgy1sdfvzq32zyj8yibkcpfxlll"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-xz-5.4.3-1-any.pkg.tar.zst"; + sha256 = "0s8sg0x3z575z4473ixw2yp2nccy1w1gq95r9pa1kqdzv23cskc4"; }) (pkgs.fetchurl { @@ -161,8 +161,8 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-12.2.0-10-any.pkg.tar.zst"; - sha256 = "1xilwrasyj3xbrv4wjvc53bv45k7szpzgnnakdnl1jg81960byx5"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-gcc-libgfortran-13.1.0-4-any.pkg.tar.zst"; + sha256 = "0a6w79pkya811wk5dhswh38rpway6xii7vq3a7hy50jsqjr5k5hy"; }) (pkgs.fetchurl { @@ -171,12 +171,22 @@ }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-numpy-1.24.2-3-any.pkg.tar.zst"; - sha256 = "0d81782q72ygkycfn1y2yvsp7g55190zdklkv42pizzapn8h3a2l"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-numpy-1.24.3-1-any.pkg.tar.zst"; + sha256 = "0yg1n35mrjs8gi0xmzkjcj5y4zh0h7izxqh7kn04paihf2fnhi3j"; }) (pkgs.fetchurl { - url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-setuptools-67.7.1-1-any.pkg.tar.zst"; - sha256 = "0d4j7n133q4whs8ipjqn9azqfc1bx60dylmjwgq62vn3fxbf307p"; + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-setuptools-67.7.2-1-any.pkg.tar.zst"; + sha256 = "1xq0g1b7c1rk5ksy7qp9iy6iadbhzwf6114j2h2sv43yrr5ahcb9"; +}) + +(pkgs.fetchurl { + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-lmdb-0.9.29-1-any.pkg.tar.zst"; + sha256 = "15953bfvx7mf59gb2b6aai3kfs1mdz568bimjds8w9fkvwqd41z3"; +}) + +(pkgs.fetchurl { + url = "https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-python-lmdb-1.4.1-1-any.pkg.tar.zst"; + sha256 = "1w6w00122frlwa6mi2y4lkr36zbzb1pqcia5qpgmhybca7q2ykjg"; }) ]