M-Labs
/
artiq-extrapkg
2
0
Fork 4
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

Compare commits

merge into: M-Labs:release-8
Branches Tags
M-Labs:master
M-Labs:release-8
M-Labs:release-7
...
pull from: M-Labs:master
Branches Tags
M-Labs:release-8
M-Labs:master
M-Labs:release-7

39 Commits
release-8 ... master

Author SHA1 Message Date
Sebastien Bourdeauducq 694278c010 conda: update anaconda 2024-11-16 14:31:44 +08:00
Sebastien Bourdeauducq bde6328085 conda: add jsonschema dependency 2024-11-16 14:22:57 +08:00
Sebastien Bourdeauducq 4672f4aabb msys2: regenerate packages 2024-11-15 10:43:55 +08:00
Sebastien Bourdeauducq 1842619f30 msys2: add back scipy 2024-11-15 10:38:27 +08:00
Sebastien Bourdeauducq c4e9c4bb84 msys2: regenerate packages 2024-11-15 10:37:31 +08:00
Sebastien Bourdeauducq a339626d65 msys2: add jsonschema dependency 2024-11-15 10:22:40 +08:00
Sebastien Bourdeauducq 29981e7feb switch to Wine unstable 
Fixes
wine: Call from 00006FFFFFF6E1B8 to unimplemented function KERNEL32.dll.CopyFile2, aborting
 2024-11-15 10:20:25 +08:00
Sebastien Bourdeauducq b9e1220d28 flake: update dependencies 2024-11-15 10:13:29 +08:00
Sebastien Bourdeauducq 87e306eb63 flake: update dependencies 2024-11-11 19:51:45 +08:00
Sebastien Bourdeauducq c7a5c19708 msys2: update, python 3.12 2024-11-11 19:50:55 +08:00
Sebastien Bourdeauducq 544108eafd msys2: get python by transitive dependency 2024-10-30 13:35:48 +08:00
Sebastien Bourdeauducq 70f9398ad3 flake: update dependencies 2024-10-30 13:31:40 +08:00
Sebastien Bourdeauducq ba488e77d9 flake: update dependencies 2024-10-18 15:06:21 +08:00
Sebastien Bourdeauducq 0d8762fa31 update dependencies 2024-10-08 15:12:12 +08:00
Sebastien Bourdeauducq 27b15ed3d4 flake: update dependencies 2024-10-01 14:49:35 +08:00
Egor Savkin f0e2486d6c Change environment variables to positional arguments 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-09-30 13:27:51 +08:00
Sebastien Bourdeauducq b12ca4b928 msys2/asyncserial: add missing pyserial dependency 2024-09-26 07:47:19 +08:00
Florian Agbuya 1702341f28 msys2: update 2024-08-27 16:18:30 +08:00
Florian Agbuya c249e6af78 msys2: add platformdirs dependency 2024-08-27 15:56:58 +08:00
Florian Agbuya 63f34fbf0c conda: add platformdirs dependency 2024-08-27 15:55:26 +08:00
Egor Savkin 1002e0437a msys2: fix afws client certs 
Co-authored-by: Egor Savkin <es@m-labs.hk>
Co-committed-by: Egor Savkin <es@m-labs.hk>
 2024-08-15 18:35:54 +08:00
Egor Savkin eac0d077de Fix msys2 package 
Package appeared to have /nix/store... path instead of normal clang64

Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-08-14 13:48:02 +08:00
Sebastien Bourdeauducq 32d116dbf6 flake: update dependencies 2024-08-02 10:32:02 +08:00
Sebastien Bourdeauducq 50abd84278 msys2: modernize python install script 2024-08-02 10:30:03 +08:00
Sebastien Bourdeauducq 9e85187ead flake: update dependencies 2024-07-31 17:44:17 +08:00
Sebastien Bourdeauducq 25ee3c68f1 wand: remove (no qt6) 2024-07-27 23:17:10 +08:00
Sebastien Bourdeauducq 7f00ab0cb6 update conda, py3.12 2024-07-27 22:44:47 +08:00
Sebastien Bourdeauducq d5c99474ed linien: py3.12 2024-07-27 22:42:14 +08:00
Sebastien Bourdeauducq 1e64b5786c msys2: update, qt6 2024-07-27 22:19:14 +08:00
Sebastien Bourdeauducq 30d9b5ae54 qt5 -> qt6 2024-07-27 22:06:39 +08:00
Sebastien Bourdeauducq 05d45229af flake: update dependencies 2024-07-27 22:06:31 +08:00
Florian Agbuya 5b4560d8ca msys2: update 2024-07-24 14:51:10 +08:00
Florian Agbuya 1ec52c60fe remove scipy from artiq dependencies 2024-07-24 14:48:54 +08:00
Egor Savkin 7ffe3dcf22 Update flake and msys2 packages 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-07-15 15:08:16 +08:00
Sebastien Bourdeauducq 8f8550e243 Revert "msys2: update" 
msys2 llvmlite has dropped support for riscv according to Mattermost report.

This reverts commit 312b93915e.
 2024-07-10 10:42:53 +02:00
Sebastien Bourdeauducq 312b93915e msys2: update 2024-07-09 17:44:16 +02:00
Sebastien Bourdeauducq e8c29bb8f1 flake: update dependencies 2024-07-09 17:06:56 +02:00
Egor Savkin 0cc34b4b47 Add zadig to msys2 installation, that can be accessed from start menu 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-06-24 15:06:18 +08:00
Sebastien Bourdeauducq ce9e23579c flake: update dependencies 2024-06-19 12:48:40 +08:00
11 changed files with 390 additions and 341 deletions
Show Stats Expand all files Collapse all files

123
flake.lock
View File

@ -13,11 +13,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717637438, "lastModified": 1720768567,
"narHash": "sha256-BXFidNm3Em8iChPGu1L0s2bY+f2yQ0VVid4MuOoTehw=", "narHash": "sha256-3VoK7o5MtHtbHLrc6Pv+eQWFtaz5Gd/YWyV5TD3c5Ss=",
"owner": "m-labs", "owner": "m-labs",
"repo": "artiq-comtools", "repo": "artiq-comtools",
"rev": "78d27026efe76a13f7b4698a554f55811369ec4d", "rev": "f93570d8f2ed5a3cfb3e1c16ab00f2540551e994",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -42,15 +42,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706553333, "lastModified": 1722288472,
"narHash": "sha256-woCaWllU5vKn0aXxt2VajlK7hseQe7LrJY5LAKF9LZ8=", "narHash": "sha256-KXyTCZNwXkMayGuOYLLIg8q/eCPC5W0pdcGQ0XKYoNY=",
"ref": "refs/heads/master", "ref": "release-7",
"rev": "86df3ceb606a50708f812ce8c3c8a4e7cfc3db8f", "rev": "b3d818f61ffffc29226d4aa3845dece9941d61cd",
"revCount": 35, "revCount": 37,
"type": "git", "type": "git",
"url": "https://gitlab.com/duke-artiq/artiq-stubs.git" "url": "https://gitlab.com/duke-artiq/artiq-stubs.git"
}, },
"original": { "original": {
"ref": "release-7",
"type": "git", "type": "git",
"url": "https://gitlab.com/duke-artiq/artiq-stubs.git" "url": "https://gitlab.com/duke-artiq/artiq-stubs.git"
} }
@ -58,19 +59,19 @@
"artiqpkgs": { "artiqpkgs": {
"inputs": { "inputs": {
"artiq-comtools": "artiq-comtools", "artiq-comtools": "artiq-comtools",
"mozilla-overlay": "mozilla-overlay",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay",
"sipyco": "sipyco", "sipyco": "sipyco",
"src-migen": "src-migen", "src-migen": "src-migen",
"src-misoc": "src-misoc", "src-misoc": "src-misoc",
"src-pythonparser": "src-pythonparser" "src-pythonparser": "src-pythonparser"
}, },
"locked": { "locked": {
"lastModified": 1717638354, "lastModified": 1731636768,
"narHash": "sha256-eyI8OsOrn/j8ChbCpyFpS5VXBW8xSNGGIboFGQj/d4I=", "narHash": "sha256-Oqa7G8E9lFIFouYE2uP5ii4Bo6eKHmUUHwj4uievMdE=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "ebc1e3fb767d6c0eac6eac20c3afeaba2ab70d1a", "rev": "9aae89be69fa3ab1dd0a75f399ffc6cf208818d2",
"revCount": 8833, "revCount": 9048,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
}, },
@ -97,11 +98,11 @@
"trap-dac-utils": "trap-dac-utils" "trap-dac-utils": "trap-dac-utils"
}, },
"locked": { "locked": {
"lastModified": 1716922507, "lastModified": 1729547028,
"narHash": "sha256-C2bX34vzePyegeQK6eezU2IWJJFnUiugNZyVSg+qE5c=", "narHash": "sha256-l7GGLjTrGtF23XYsdjQmLPgccDDUwjbGQQsQ3lhn/SI=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "1331053e5ae1e468bcdccb724bf069e447542ae6", "rev": "dbe0e8f3902527c6254589303e020db08760dd85",
"revCount": 1334, "revCount": 1384,
"type": "git", "type": "git",
"url": "https://gitlab.com/duke-artiq/dax.git" "url": "https://gitlab.com/duke-artiq/dax.git"
}, },
@ -133,11 +134,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1710146030,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -173,11 +174,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715377543, "lastModified": 1722261486,
"narHash": "sha256-JdHNJhgGkWqqUcsLfoZ7B/v4l6uwpegQvJuJAkfi2dw=", "narHash": "sha256-F+43turwuIdCcs8yu4rXCtSEE2ZDssFDEFex5+Uel4E=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "1ca15e9b607eb88a17e3dcab022cb0d31c8f2fea", "rev": "2888fa292a52ac6666590e1429786210cda04b18",
"revCount": 104, "revCount": 111,
"type": "git", "type": "git",
"url": "https://gitlab.com/duke-artiq/flake8-artiq.git" "url": "https://gitlab.com/duke-artiq/flake8-artiq.git"
}, },
@ -186,34 +187,18 @@
"url": "https://gitlab.com/duke-artiq/flake8-artiq.git" "url": "https://gitlab.com/duke-artiq/flake8-artiq.git"
} }
}, },
"mozilla-overlay": {
"flake": false,
"locked": {
"lastModified": 1704373101,
"narHash": "sha256-+gi59LRWRQmwROrmE1E2b3mtocwueCQqZ60CwLG+gbg=",
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"rev": "9b11a87c0cc54e308fa83aac5b4ee1816d5418a2",
"type": "github"
},
"original": {
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1717281328, "lastModified": 1731319897,
"narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b3b2b28c1daa04fe2ae47c21bb76fd226eac4ca1", "rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -224,6 +209,28 @@
"daxpkgs": "daxpkgs" "daxpkgs": "daxpkgs"
} }
}, },
"rust-overlay": {
"inputs": {
"nixpkgs": [
"artiqpkgs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719454714,
"narHash": "sha256-MojqG0lyUINkEk0b3kM2drsU5vyaF8DFZe/FAlZVOGs=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "d1c527659cf076ecc4b96a91c702d080b213801e",
"type": "github"
},
"original": {
"owner": "oxalica",
"ref": "snapshot/2024-08-01",
"repo": "rust-overlay",
"type": "github"
}
},
"sipyco": { "sipyco": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -232,11 +239,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717637367, "lastModified": 1728371104,
"narHash": "sha256-4mSm9wl5EMgzzrW6w86IDUevkEOT99FESHGcxcyQbD0=", "narHash": "sha256-PPnAyDedUQ7Og/Cby9x5OT9wMkNGTP8GS53V6N/dk4w=",
"owner": "m-labs", "owner": "m-labs",
"repo": "sipyco", "repo": "sipyco",
"rev": "02b96ec2473a3c3d3c980899de2564ddce949dab", "rev": "094a6cd63ffa980ef63698920170e50dc9ba77fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -248,11 +255,11 @@
"src-migen": { "src-migen": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1715484909, "lastModified": 1727677091,
"narHash": "sha256-4DCHBUBfc/VA+7NW2Hr0+JP4NnKPru2uVJyZjCCk0Ws=", "narHash": "sha256-Zg3SQnTwMM/VkOGKogbPyuCC2NhLy8HB2SPEUWWNgCU=",
"owner": "m-labs", "owner": "m-labs",
"repo": "migen", "repo": "migen",
"rev": "4790bb577681a8c3a8d226bc196a4e5deb39e4df", "rev": "c19ae9f8ae162ffe2d310a92bfce53ac2a821bc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -264,11 +271,11 @@
"src-misoc": { "src-misoc": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1715647536, "lastModified": 1729234629,
"narHash": "sha256-q+USDcaKHABwW56Jzq8u94iGPWlyLXMyVt0j/Gyg+IE=", "narHash": "sha256-TLsTCXV5AC2xh+bS7EhBVBKqdqIU3eKrnlWcFF9LtAM=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "fea9de558c730bc394a5936094ae95bb9d6fa726", "rev": "6085a312bca26adeca6584e37d08c8ba2e1d6e38",
"revCount": 2455, "revCount": 2460,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/misoc.git" "url": "https://github.com/m-labs/misoc.git"
@ -349,11 +356,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1714081850, "lastModified": 1718374915,
"narHash": "sha256-+zts5WigebrD8eg787dYlbByEBSXNGp7/ghRtcGkIDc=", "narHash": "sha256-XBB+9VPF8njZzqMrOaWlqlbf+NrnnDIvfVsiig2TPvc=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "a53849ade1400e30ac7399bcb05ae8508e725f48", "rev": "c3cf4be6bf6b1a42fc57eecd5afebb0beddfb02a",
"revCount": 298, "revCount": 300,
"type": "git", "type": "git",
"url": "https://gitlab.com/duke-artiq/trap-dac-utils.git" "url": "https://gitlab.com/duke-artiq/trap-dac-utils.git"
}, },

57
flake.nix
View File

@ -27,8 +27,8 @@
condaDeps = with pkgs; [ zlib xorg.libSM xorg.libICE xorg.libX11 xorg.libXau xorg.libXi xorg.libXrender libselinux libGL ]; condaDeps = with pkgs; [ zlib xorg.libSM xorg.libICE xorg.libX11 xorg.libXau xorg.libXi xorg.libXrender libselinux libGL ];
# Use the full Anaconda distribution, which already contains conda-build and its many dependencies. # Use the full Anaconda distribution, which already contains conda-build and its many dependencies.
condaInstaller = pkgs.fetchurl { condaInstaller = pkgs.fetchurl {
url = "https://repo.anaconda.com/archive/Anaconda3-2024.02-1-Linux-x86_64.sh"; url = "https://repo.anaconda.com/archive/Anaconda3-2024.10-1-Linux-x86_64.sh";
sha256 = "sha256-xTbdt7S6c4vdvU5YGykwjLMy+hKuP6LNZoFL1zXf8jE="; sha256 = "sha256-O6CimBVcMvv9gMvCOCmFYL9pot9RF4MFSt/BUbdtgNg=";
}; };
condaInstallerEnv = pkgs.buildFHSEnv { condaInstallerEnv = pkgs.buildFHSEnv {
name = "conda-installer-env"; name = "conda-installer-env";
@ -50,7 +50,7 @@
installPhase = installPhase =
'' ''
conda-installer-env -c "./conda-installer.sh -p $out -b" conda-installer-env -c "./conda-installer.sh -p $out -b"
substituteInPlace $out/lib/python3.11/site-packages/conda/gateways/disk/__init__.py \ substituteInPlace $out/lib/python3.12/site-packages/conda/gateways/disk/__init__.py \
--replace "os.chmod(path, 0o2775)" "pass" --replace "os.chmod(path, 0o2775)" "pass"
''; '';
}; };
@ -211,27 +211,9 @@
# no unit tests without hardware so do a simple smoke test # no unit tests without hardware so do a simple smoke test
checkPhase = "python -m hut2.aqctl_hut2 -h"; checkPhase = "python -m hut2.aqctl_hut2 -h";
}; };
wand = pkgs.python3Packages.buildPythonPackage {
pname = "wand";
version = "0.4.dev";
src = pkgs.fetchFromGitHub {
owner = "OxfordIonTrapGroup";
repo = "wand";
rev = "c080ddab6b2d94bb673ed32a0cea2bf68e66c702";
sha256 = "sha256-T27/mZepPrnheoVEKsP5cRDFc1JffTnuPvXq2r2GP4E=";
};
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
dontWrapQtApps = true;
postFixup = ''
wrapQtApp "$out/bin/wand_gui"
'';
propagatedBuildInputs = [ artiqpkgs.packages.x86_64-linux.artiq artiqpkgs.packages.x86_64-linux.qasync ]
++ [ artiqpkgs.inputs.sipyco.packages.x86_64-linux.sipyco ]
++ (with pkgs.python3Packages; [ numpy scipy influxdb pyqtgraph setuptools ]);
};
flake8-artiq = daxpkgs.packages.x86_64-linux.flake8-artiq; flake8-artiq = daxpkgs.packages.x86_64-linux.flake8-artiq;
dax = daxpkgs.packages.x86_64-linux.dax.overridePythonAttrs (oa: { dax = daxpkgs.packages.x86_64-linux.dax.overridePythonAttrs (oa: {
nativeBuildInputs = (oa.nativeBuildInputs or []) ++ [ pkgs.qt5.wrapQtAppsHook ]; nativeBuildInputs = (oa.nativeBuildInputs or []) ++ [ pkgs.qt6.wrapQtAppsHook ];
doCheck = false; doCheck = false;
}); });
trap-dac-utils = daxpkgs.packages.x86_64-linux.trap-dac-utils; trap-dac-utils = daxpkgs.packages.x86_64-linux.trap-dac-utils;
@ -243,10 +225,10 @@
rev = "0f0196b6941b0c44a33c85d8c02047ca65466463"; rev = "0f0196b6941b0c44a33c85d8c02047ca65466463";
sha256 = "0mx6yjvprhdnkdigwns8mg6v5daqxpgbv7mf63fa76i1iv2wvak4"; sha256 = "0mx6yjvprhdnkdigwns8mg6v5daqxpgbv7mf63fa76i1iv2wvak4";
}; };
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ]; nativeBuildInputs = [ pkgs.qt6.wrapQtAppsHook ];
dontWrapQtApps = true; dontWrapQtApps = true;
propagatedBuildInputs = [ artiqpkgs.packages.x86_64-linux.artiq ] propagatedBuildInputs = [ artiqpkgs.packages.x86_64-linux.artiq ]
++ (with pkgs.python3Packages; [ numpy pyqt5 pyqtgraph ]); ++ (with pkgs.python3Packages; [ numpy pyqt6 pyqtgraph ]);
doCheck = false; doCheck = false;
}; };
linien-client = pkgs.python3Packages.buildPythonPackage rec { linien-client = pkgs.python3Packages.buildPythonPackage rec {
@ -282,7 +264,7 @@
postInstall = postInstall =
'' ''
# conflicts with linien-client # conflicts with linien-client
rm -rf $out/lib/python3.11/site-packages/linien/__pycache__ rm -rf $out/lib/python3.12/site-packages/linien/__pycache__
''; '';
}; };
# replace broken (as usual) setuptools launcher # replace broken (as usual) setuptools launcher
@ -352,6 +334,8 @@
"tqdm" "tqdm"
"python-lmdb" "python-lmdb"
"artiq-comtools" "artiq-comtools"
"platformdirs"
"jsonschema"
]; ];
} }
@ -391,12 +375,6 @@
src = hut2.src; src = hut2.src;
dependencies = [ "sipyco" ]; dependencies = [ "sipyco" ];
} }
{
name = "wand";
version = wand.version;
src = wand.src;
dependencies = [ "artiq" "qasync" "numpy" "scipy" "influxdb" ];
}
{ {
name = "flake8-artiq"; name = "flake8-artiq";
version = flake8-artiq.version; version = flake8-artiq.version;
@ -457,7 +435,7 @@
name = "python-asyncserial"; name = "python-asyncserial";
version = artiqpkgs.packages.x86_64-linux.asyncserial.version; version = artiqpkgs.packages.x86_64-linux.asyncserial.version;
src = artiqpkgs.packages.x86_64-linux.asyncserial.src; src = artiqpkgs.packages.x86_64-linux.asyncserial.src;
depends = [ "mingw-w64-clang-x86_64-python" ]; depends = [ "mingw-w64-clang-x86_64-python" "mingw-w64-clang-x86_64-python-pyserial" ];
}; };
msys2-korad_ka3005p = msys2.makeMsys2Package { msys2-korad_ka3005p = msys2.makeMsys2Package {
name = "korad_ka3005p"; name = "korad_ka3005p";
@ -535,6 +513,12 @@
sha256 = "sha256-RiXJqvmFDaItr6KgoWTekUPHue4i/LM4uBqfVx9HKpc="; sha256 = "sha256-RiXJqvmFDaItr6KgoWTekUPHue4i/LM4uBqfVx9HKpc=";
}; };
zadig-binary = pkgs.fetchurl {
url = "https://github.com/pbatard/libwdi/releases/download/v1.5.1/zadig-2.9.exe";
name = "zadig";
sha256 = "sha256-TsqpXfPaNiFIagQ674swULi6/nyQFAKHHoFiKe+CA5s=";
};
src = ./.; src = ./.;
buildInputs = [ pkgs.gnutar pkgs.zstd pkgs.pacman pkgs.fakeroot ]; buildInputs = [ pkgs.gnutar pkgs.zstd pkgs.pacman pkgs.fakeroot ];
phases = [ "installPhase" ]; phases = [ "installPhase" ];
@ -549,6 +533,11 @@
fakeroot pacman -U --asdeps --noconfirm --cachedir tmp/cache --config tmp/pacman.conf --root $out ${pkgs.lib.concatStringsSep " " (map (p: "${p}") msys2-pkgs)} fakeroot pacman -U --asdeps --noconfirm --cachedir tmp/cache --config tmp/pacman.conf --root $out ${pkgs.lib.concatStringsSep " " (map (p: "${p}") msys2-pkgs)}
fakeroot pacman -U --asdeps --noconfirm --cachedir tmp/cache --config tmp/pacman.conf --root $out ${pkgs.lib.concatStringsSep " " (map (p: "${p}") artiq-deps-pkgs)} fakeroot pacman -U --asdeps --noconfirm --cachedir tmp/cache --config tmp/pacman.conf --root $out ${pkgs.lib.concatStringsSep " " (map (p: "${p}") artiq-deps-pkgs)}
fakeroot pacman -U --noconfirm --cachedir tmp/cache --config tmp/pacman.conf --root $out ${msys2-artiq}/*.pkg.tar.zst ${msys2-artiq-comtools}/*.pkg.tar.zst ${msys2-pythonparser}/*.pkg.tar.zst ${msys2-sipyco}/*.pkg.tar.zst fakeroot pacman -U --noconfirm --cachedir tmp/cache --config tmp/pacman.conf --root $out ${msys2-artiq}/*.pkg.tar.zst ${msys2-artiq-comtools}/*.pkg.tar.zst ${msys2-pythonparser}/*.pkg.tar.zst ${msys2-sipyco}/*.pkg.tar.zst
cp ${zadig-binary} $out/zadig.exe
mkdir -p $out/clang64/etc/ssl/certs
cp -f $out/usr/ssl/certs/ca-bundle.crt $out/clang64/etc/ssl/certs/ca-bundle.crt
cp -f $out/usr/ssl/cert.pem $out/clang64/etc/ssl/cert.pem
cp -f $out/usr/ssl/certs/ca-bundle.trust.crt $out/clang64/etc/ssl/certs/ca-bundle.trust.crt
rm -rf $out/mingw64* $out/clang32* $out/clangarm64* $out/mingw32* $out/ucrt64* \ rm -rf $out/mingw64* $out/clang32* $out/clangarm64* $out/mingw32* $out/ucrt64* \
$out/var/lib/pacman/sync/mingw64* $out/var/lib/pacman/sync/clang32* $out/var/lib/pacman/sync/clangarm64* \ $out/var/lib/pacman/sync/mingw64* $out/var/lib/pacman/sync/clang32* $out/var/lib/pacman/sync/clangarm64* \
$out/var/lib/pacman/sync/mingw32* $out/var/lib/pacman/sync/ucrt64* \ $out/var/lib/pacman/sync/mingw32* $out/var/lib/pacman/sync/ucrt64* \
@ -567,7 +556,7 @@
sed -i "s|@VERSION@|${artiqpkgs.packages.x86_64-linux.artiq.version}|g" qt-ifw/config/config.xml qt-ifw/packages/com.msys2.root/meta/package.xml ; sed -i "s|@VERSION@|${artiqpkgs.packages.x86_64-linux.artiq.version}|g" qt-ifw/config/config.xml qt-ifw/packages/com.msys2.root/meta/package.xml ;
7z a -mx9 -md128m "qt-ifw/packages/com.msys2.root/data/msys64.7z" "$msys2_artiq_root/"* 7z a -mx9 -md128m "qt-ifw/packages/com.msys2.root/data/msys64.7z" "$msys2_artiq_root/"*
${pkgs.wineWowPackages.stable}/bin/wine64 $msys2_qt_ifw/clang64/bin/binarycreator.exe \ ${pkgs.wineWowPackages.unstable}/bin/wine64 $msys2_qt_ifw/clang64/bin/binarycreator.exe \
-t "$msys2_qt_ifw/clang64/bin/installerbase.exe" \ -t "$msys2_qt_ifw/clang64/bin/installerbase.exe" \
-p "qt-ifw/packages" \ -p "qt-ifw/packages" \
-c "qt-ifw/config/config.xml" \ -c "qt-ifw/config/config.xml" \
@ -597,7 +586,7 @@
fakeroot fakeroot
p7zip p7zip
msys2.wine-msys2 msys2.wine-msys2
wineWowPackages.stable wineWowPackages.unstable
]; ];
}; };
}; };

1
installer/qt-ifw/packages/com.msys2.root/meta/installscript.js
View File

@ -35,6 +35,7 @@ function createShortcuts()
} }
component.addOperation("CreateShortcut", "@TargetDir@/clang64.exe", "@StartMenuDir@/MSYS2 with ARTIQ.lnk", "iconPath=@TargetDir@/clang64.exe"); component.addOperation("CreateShortcut", "@TargetDir@/clang64.exe", "@StartMenuDir@/MSYS2 with ARTIQ.lnk", "iconPath=@TargetDir@/clang64.exe");
component.addOperation("CreateShortcut", "@TargetDir@/zadig.exe", "@StartMenuDir@/Zadig Driver Installer.lnk", "iconPath=@TargetDir@/zadig.exe");
component.addOperation( "Execute", component.addOperation( "Execute",
["@TargetDir@\\usr\\bin\\bash.exe", "--login", "-c", "exit"]); ["@TargetDir@\\usr\\bin\\bash.exe", "--login", "-c", "exit"]);

20
msys2/PKGBUILD.common
View File

@ -7,26 +7,22 @@ sha256sums=("SKIP")
build() { build() {
mkdir clang64 mkdir clang64
export PYTHONPATH=`pwd`/clang64/lib/python3.11/site-packages export PYTHONPATH=`pwd`/clang64/lib/python3.12/site-packages
chmod +w -R source chmod +w -R source
cd source cd source
wine-msys2-build python setup.py install --single-version-externally-managed --prefix=../clang64 --record=setuptools-sucks.txt wine-msys2-build python -m build --wheel --skip-dependency-check --no-isolation
cd .. }
# setuptools creates this file if it doesn't already exist, which causes conflicts between pacman packages package() {
# see: https://corte.si/posts/code/setuptoolssucks/ cd source
rm -f clang64/lib/python3.11/site-packages/easy-install.pth wine-msys2-build python -m installer --destdir="${pkgdir}" --prefix="clang64/" dist/*.whl
# patch broken shebangs (Z:/nix/store/...) # patch broken shebangs (Z:/nix/store/...)
for entrypoint in clang64/bin/*-script.py; do for entrypoint in ${pkgdir}/bin/*-script.py; do
[ -f "$entrypoint" ] || continue [ -f "$entrypoint" ] || continue
sed -i "1s|#!.*|#!python|" $entrypoint sed -i "1s|#!.*|#!python|" $entrypoint
done done
for entrypoint in clang64/bin/*-script.pyw; do for entrypoint in ${pkgdir}/bin/*-script.pyw; do
[ -f "$entrypoint" ] || continue [ -f "$entrypoint" ] || continue
sed -i "1s|#!.*|#!pythonw|" $entrypoint sed -i "1s|#!.*|#!pythonw|" $entrypoint
done done
} }
package() {
cp -R clang64 ${pkgdir}
}

7
msys2/artiq_dependencies.txt
View File

@ -1,7 +1,6 @@
mingw-w64-clang-x86_64-python3.11
mingw-w64-clang-x86_64-python-h5py mingw-w64-clang-x86_64-python-h5py
mingw-w64-clang-x86_64-python-pyqt5 mingw-w64-clang-x86_64-python-pyqt6
mingw-w64-clang-x86_64-qt5-svg mingw-w64-clang-x86_64-qt6-svg
mingw-w64-clang-x86_64-python-qasync mingw-w64-clang-x86_64-python-qasync
mingw-w64-clang-x86_64-python-pyqtgraph mingw-w64-clang-x86_64-python-pyqtgraph
mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-numpy
@ -13,7 +12,9 @@ mingw-w64-clang-x86_64-python-pygit2
mingw-w64-clang-x86_64-python-llvmlite mingw-w64-clang-x86_64-python-llvmlite
mingw-w64-clang-x86_64-python-levenshtein mingw-w64-clang-x86_64-python-levenshtein
mingw-w64-clang-x86_64-python-lmdb mingw-w64-clang-x86_64-python-lmdb
mingw-w64-clang-x86_64-python-platformdirs
mingw-w64-clang-x86_64-lld mingw-w64-clang-x86_64-lld
mingw-w64-clang-x86_64-llvm mingw-w64-clang-x86_64-llvm
mingw-w64-clang-x86_64-openocd mingw-w64-clang-x86_64-openocd
mingw-w64-clang-x86_64-bscan-spi-bitstreams mingw-w64-clang-x86_64-bscan-spi-bitstreams
mingw-w64-clang-x86_64-python-jsonschema

360
msys2/artiq_dependency_packages.nix
View File

@ -1,21 +1,21 @@
{ pkgs } : [ { pkgs } : [
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libunwind"; name = "mingw-w64-clang-x86_64-libunwind";
sha256 = "1krbm0ysv5qg3g2y5zj0wfqy8n1ni6pfqpv57xp8bbzrai16hrbs"; sha256 = "0xsp7ksyqxzdcgjrl18mg3djil12vk7jf3l02h9l6d753waqf4f3";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libc++"; name = "mingw-w64-clang-x86_64-libc++";
sha256 = "1msgipk6x6pn5ji9iykgz6cm7cm1a2fmvpa8k5m76xk78ijb6cmj"; sha256 = "1m50hbb6v5g13747gb6l6wzjxy1fxgdd4zhd30fni2zfnnzlrhd1";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-expat-2.6.2-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-expat-2.6.4-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-expat"; name = "mingw-w64-clang-x86_64-expat";
sha256 = "0kj1vzjh3qh7d2g47avlgk7a6j4nc62111hy1m63jwq0alc01k38"; sha256 = "03fp2yacv7gk0g049lffz6pbj93vpjmzqxxa312d4gxczi57nqdv";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -49,27 +49,27 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libtre-git-r177.07e66d0-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libtre-0.9.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libtre-git"; name = "mingw-w64-clang-x86_64-libtre";
sha256 = "0fc9hxsdks1xy5fv0rcna433hlzf6jhs77hg0hfzkzhn06f9alp4"; sha256 = "1y5d2cbkpd0ngqlsv6hvz47nxb1wry33i5s1clg2k53yhgjkg8vv";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libsystre-1.0.1-5-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libsystre-1.0.1-6-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libsystre"; name = "mingw-w64-clang-x86_64-libsystre";
sha256 = "05qsn8fkks4f93jkas43s47axqqgx5m64b45p462si3nlb8cjirq"; sha256 = "19c71fs5gqjrf88mv7l702fjg228xd9lfbxg0mkzm3ljvv4ljn0q";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-ncurses-6.4.20231217-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-ncurses-6.5.20240831-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-ncurses"; name = "mingw-w64-clang-x86_64-ncurses";
sha256 = "00046d52zsr8zjifl7h22jfihhh53h20ipvbqmvf9myssw2fwjza"; sha256 = "1hlfj9g4s767s502sawwbcv4a0xd3ym3ip4jswmhq48wh5050iyb";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openssl-3.3.1-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openssl-3.4.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-openssl"; name = "mingw-w64-clang-x86_64-openssl";
sha256 = "0ywhwm4kw3qjzv0872qwabnsq2rzbmqjb9m69q3fykjl0m9gigsa"; sha256 = "0cgiqjmgdnwnv9r88z634dmqrzh06dmsfncyzymw0s16nnv2k7k2";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -79,9 +79,9 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-readline-8.2.010-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-readline-8.2.013-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-readline"; name = "mingw-w64-clang-x86_64-readline";
sha256 = "1s47pd5iz8y3hspsxn4pnp0v3m05ccia40v5nfvx0rmwgvcaz82v"; sha256 = "0pv1ypqfgm4mimzr0amq9anr1ysqmzrwv6gfk7rrlzhihadknsvr";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -97,9 +97,9 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-sqlite3-3.46.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-sqlite3-3.46.1-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-sqlite3"; name = "mingw-w64-clang-x86_64-sqlite3";
sha256 = "0q676i2z5nr4c71jnd4z5qz9xa1xryl0cpi84w74yvd0p4qiz7y2"; sha256 = "1axplxyjnaz411qzjjqwbj55fbrh4akq3plm2p1sx64jp844xpyq";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -109,45 +109,45 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-xz-5.6.2-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-xz-5.6.3-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-xz"; name = "mingw-w64-clang-x86_64-xz";
sha256 = "0phb9hwqksk1rg29yhwlc7si78zav19c2kac0i841pc7mc2n9gzx"; sha256 = "09cbqivx9afh7wnqi5iiyrbhnv3y2qc9h1brm420sjpaqhz4prkv";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tzdata-2024a-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tzdata-2024b-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-tzdata"; name = "mingw-w64-clang-x86_64-tzdata";
sha256 = "1lsfn3759cyf56zlmfvgy6ihs4iks6zhlnrbfmnq5wml02k936ji"; sha256 = "0jihnr1i7vyzczxz60ds1x3gcm3p4ad2pq9d5vvpwjdwrxkvxmkc";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-3.11.9-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-3.12.7-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python"; name = "mingw-w64-clang-x86_64-python";
sha256 = "0ah1idjqxg7jc07a1gz9z766rjjd0f0c6ri4hpcsimsrbj1zjd3c"; sha256 = "1c71xm6dp700qw1vzwy97bqk5093yhhzvk8p498z2zdn92s1dxj9";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r387.gcf5c50cce-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libwinpthread-git"; name = "mingw-w64-clang-x86_64-libwinpthread-git";
sha256 = "0yqrzvnqs8zr6whazp9q4r74viq0440ikvql92zj5zg9yzm507zl"; sha256 = "14q908glsqrbkk932mynvj2jm154v0ywndbn4a7s734fn8xs5hmq";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-openmp-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-openmp-19.1.3-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-llvm-openmp"; name = "mingw-w64-clang-x86_64-llvm-openmp";
sha256 = "0zqxln0f7hsv4zw70br7jzank9flrf5aj2vvf5kndq24x22avzng"; sha256 = "1d5zdr9sy8ffn4p4ia5c7xgxa4dsrpl79brx0hlfw0xyjrm0nxlr";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openblas-0.3.27-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openblas-0.3.28-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-openblas"; name = "mingw-w64-clang-x86_64-openblas";
sha256 = "06ygz1wa488wqvmxbn74b0fyan4wf3lb6kbwfampgikd1gijww2k"; sha256 = "1pskcqc1lg9p8m8rk7bw3mz7mn7vw5fpl7zxa23bhjn02p5b79qq";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-1.26.4-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-2.1.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-numpy"; name = "mingw-w64-clang-x86_64-python-numpy";
sha256 = "00h0ap954cjwlsc3p01fjwy7s3nlzs90v0kmnrzxm0rljmvn4jkf"; sha256 = "1kiy7ail04ias47xbbhl9vpsz02g0g3f29ncgx5gcks9vgqldp6m";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -157,15 +157,15 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-c-ares-1.29.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-c-ares-1.34.2-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-c-ares"; name = "mingw-w64-clang-x86_64-c-ares";
sha256 = "01xg1h1a8kda0kq2921w25ybvm1ms7lfdzday0hv93f3myq7briq"; sha256 = "036jrzcc8dsaq9dqi3wprc7bbph7j88v94256f700f8qm8mbp5la";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-brotli-1.1.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-brotli-1.1.0-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-brotli"; name = "mingw-w64-clang-x86_64-brotli";
sha256 = "113mha41q53cx0hw13cq1xdf7zbsd58sh8cl1cd7xzg1q69n60w2"; sha256 = "0l7m7cbxxw9gr1h4a8i5b6sxc2j9hsy3cy3r70xadd61kjxrxi6k";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -199,9 +199,9 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-p11-kit-0.25.3-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-p11-kit-0.25.5-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-p11-kit"; name = "mingw-w64-clang-x86_64-p11-kit";
sha256 = "1jrwkc4lvw5hm5rqmi5gqh7mfkbqfa5gi81zjij0krnl0gaxw3c8"; sha256 = "00yz6cmr1ldlrskv811n345xcia88mj7w4fyx4m9z5848jxgsabd";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -217,45 +217,39 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp2-1.61.0-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp2-1.63.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-nghttp2"; name = "mingw-w64-clang-x86_64-nghttp2";
sha256 = "07bkk98126gy4k6lb9rrqqnzjfz9j2rsr5dzr2djmzdkw0h4dr95"; sha256 = "0lfqrlmapsc7ilxjmhr7hxi578vclqlhpqimbvzq0c70c0iwk864";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp3-1.3.0-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-nghttp3-1.6.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-nghttp3"; name = "mingw-w64-clang-x86_64-nghttp3";
sha256 = "0db177mgvd9lgyki5f27a095ghkx51bvscjslaj4phf9ggg82731"; sha256 = "1p7q47fin12vzyf126v1azbbpgpa0y6ighfh6mbfdb6zcyq74kbd";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.8.0-8-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.11.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-curl"; name = "mingw-w64-clang-x86_64-curl";
sha256 = "1l40fvbryl76lb5lxwpsz6b2sdmqq543w5km4mpxp3immrw1s6hs"; sha256 = "18pl32rg7zkxgyv1nw9krha0pzq0amcad0jl162jiw81khz4cc85";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-hdf5-1.14.3-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-hdf5-1.14.5-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-hdf5"; name = "mingw-w64-clang-x86_64-hdf5";
sha256 = "0pdx082m87j26cz4c2l3kr3yiv360p28qcbw9lz05l8p91jhdvfz"; sha256 = "1lx87nvrsc0fjcr93k30c4ds64swgwl5vv07058xbgqabil2293f";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-h5py-3.11.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-h5py-3.12.1-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-h5py"; name = "mingw-w64-clang-x86_64-python-h5py";
sha256 = "0lscn9gdsnichylqkl93vdzw3j1l87hg32ijk7kig7dx4xr8rf72"; sha256 = "1vcaadsln7pbwzfbh8svkd5miagxhsx3irr8azz6cb64cyjag9d0";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pyqt5-sip-12.13.0-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt6-sip-13.8.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-pyqt5-sip"; name = "mingw-w64-clang-x86_64-python-pyqt6-sip";
sha256 = "1100zd3xz7g7pf3z11pqj9cvzpap7yz4q58gnq5yaky51s1246h7"; sha256 = "1x948jsz5b0ispfsqbdpyskhvhf6ik8kam2wswar4i72j4vf4sda";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-dbus-1.14.10-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-dbus";
sha256 = "0qrp1bsidhq4yabwz6wgz88s3d15w1aiamvpd3hwsjg0wy49mq0g";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -265,33 +259,39 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libpng-1.6.43-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-dbus-1.14.10-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-dbus";
sha256 = "0qrp1bsidhq4yabwz6wgz88s3d15w1aiamvpd3hwsjg0wy49mq0g";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libpng-1.6.44-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libpng"; name = "mingw-w64-clang-x86_64-libpng";
sha256 = "0djnvabj3zpswga0i2k496cgs9m1xy9axc8nb0ag6w647szy77b0"; sha256 = "1zg1wf37z13szm7x09h2jbr5xpxs137kr812rgkzc80i7h3h6a1x";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-wineditline-2.206-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-wineditline-2.208-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-wineditline"; name = "mingw-w64-clang-x86_64-wineditline";
sha256 = "0z9kn9mnh3ffl8dmsw3l1hys8k7sn6a2qys08k4cn225jr9nrmzs"; sha256 = "0x9d1ax81p0k1863z0jdhqg7454hb0svvil1f4aiqy1vlhqshfl5";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pcre2-10.43-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pcre2-10.44-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-pcre2"; name = "mingw-w64-clang-x86_64-pcre2";
sha256 = "0jrgk5afqg6czjp64a74mylfghsfrx1vrbb85ibs7qssks7h6x7k"; sha256 = "0cfrvrjg4k28pg5qvh94had5k3y3lr7hy8j4v4pr9y8dqws14a13";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-packaging-23.2-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-packaging-24.2-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-packaging"; name = "mingw-w64-clang-x86_64-python-packaging";
sha256 = "0zr7i0pmj0a8m41kvr973i6hc3yjv2jxxbwp4hzwml6ynjfpb1c8"; sha256 = "1m6pcrzpv80mvnsv770da7q71drc5nha636qlsjl5qvfzxi6hgfd";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-glib2-2.80.2-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-glib2-2.82.2-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-glib2"; name = "mingw-w64-clang-x86_64-glib2";
sha256 = "1wrb1zp0c5zbgzvy0d9kj8j6mivb81v548dw6wiij8ij7fd2m6fx"; sha256 = "0xwsd4l98dyar4359xgvx7s4asd2hyd4d38mh9h820mfza2abczn";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -301,33 +301,33 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-harfbuzz-8.5.0-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-harfbuzz-10.1.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-harfbuzz"; name = "mingw-w64-clang-x86_64-harfbuzz";
sha256 = "1sj4lhl3gdvr2x48z1dhhcgv12d480i4ivmmbr1ymgp37wim4sx3"; sha256 = "01xi8gw8sppz5cfhazy5kbsk638vw3gppfzfix40gjs7pas7fg9q";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-freetype-2.13.2-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-freetype-2.13.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-freetype"; name = "mingw-w64-clang-x86_64-freetype";
sha256 = "07kdykdz73jjqajarn1b1wv5mkwnwj7xw09x4iy11gpj6yz0sb8h"; sha256 = "08jn0qqibkk2s4q005ff0a1kz0yklq0cp7w4wd1g4h2ykczii2zy";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-fontconfig-2.15.0-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-icu-75.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-fontconfig";
sha256 = "19jmphak4szjln6d3s6qpi872abc01dmzhkz4q0ws80mr8h7q78i";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-icu-75.1-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-icu"; name = "mingw-w64-clang-x86_64-icu";
sha256 = "08dx68nrm3cam1nwpqvbnd27rvjr9s17dlgd7xwvq8v9hs6ky5bm"; sha256 = "0dxskyhbqgiphlz95b7hp05kcryaspa045ad8763m903nnslq7ri";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libjpeg-turbo-3.0.3-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libb2-0.98.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libb2";
sha256 = "0555dvb2xs6695sz5ndrx6y0cz3qa5cg0m5v8q1md13ssg76vlh6";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libjpeg-turbo-3.0.4-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libjpeg-turbo"; name = "mingw-w64-clang-x86_64-libjpeg-turbo";
sha256 = "0n0w3g28xbh1byysivcqxj2qxsjhbqpkvzj6xcyv0z738j2jf951"; sha256 = "1xq45dhynjx1qynnp75dwii0gzy911i8wrfa2rdarlygvr8dssr7";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -337,81 +337,87 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-vulkan-loader-1.3.283.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-vulkan-loader-1.3.296.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-vulkan-loader"; name = "mingw-w64-clang-x86_64-vulkan-loader";
sha256 = "1mfniiqslxcrz656jf1wnfiidzwicwi77hdraxmqjq9ljgkzv454"; sha256 = "0nx4586kgavhadbpwlgl287iw3g9nkmf5n6z5pvyyb3ayh760h2s";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt5-base-5.15.13+kde+r145-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-vulkan-headers-1.3.296.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-qt5-base"; name = "mingw-w64-clang-x86_64-vulkan-headers";
sha256 = "1n2w3q9avrbrc94ps57mg59hhaszcknxlmij7bl0ap8942l8ndm5"; sha256 = "042xvrs3y138saih6inihwy82qycsbilvvmvm01rb6yib0r7wig3";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt5-5.15.10-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt6-base-6.8.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pyqt5"; name = "mingw-w64-clang-x86_64-qt6-base";
sha256 = "07pccsnbsfaa3zdkc7xbd7nklphdfkqdsi1yd84dxdsxprmp808a"; sha256 = "0vz8595swk65dgj1nn8858rajjd2300xr5jz1b0bkln6n3gs4jbn";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt5-svg-5.15.13+kde+r6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt6-6.8.0dev2410211537-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-qt5-svg"; name = "mingw-w64-clang-x86_64-python-pyqt6";
sha256 = "0camszb46c097vs7xf4kvk9zydkbpjcm0sqm62fa4n5wlvr1zg8n"; sha256 = "1jjzbw4xflx750b6prph9fqf3lxdvad3yibg8h6mbdvkbhv44wrf";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-qasync-0.27.1-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt6-svg-6.8.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-qt6-svg";
sha256 = "1l20hkm8kjs6d7gcqzznyxhj0c1x07ghs395sd6w41pl4vjb5amk";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-qasync-0.27.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-qasync"; name = "mingw-w64-clang-x86_64-python-qasync";
sha256 = "075i935vgpdaw59w29w73x6k7bwpdn22bw53pjlia5xkznqmg987"; sha256 = "17q0qwdkhhjc3b3cq95d2nbjxp1r94dvgqs216fsbj32x4fd275i";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqtgraph-0.13.3-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqtgraph-0.13.7-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pyqtgraph"; name = "mingw-w64-clang-x86_64-python-pyqtgraph";
sha256 = "0kai3cpi7pbfkxp7npmz28s78jqcf1aslgz4hfara9698xg6kny6"; sha256 = "10w10qxnshba74j7s9n1b7279q6pc5za9h3yk01vdikly20ki8db";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-scipy-1.12.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-scipy-1.14.1-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-scipy"; name = "mingw-w64-clang-x86_64-python-scipy";
sha256 = "1ifd4kml73cnza2rpfc4vfd996dj46ahcs1l9r8wfa9kpk6a80ff"; sha256 = "0pykz57xa10ipj3j20v46zd2f1707jcfqdd4mbvhmk3lf12y5cxy";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-six-1.16.0-4-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-six-1.16.0-6-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-six"; name = "mingw-w64-clang-x86_64-python-six";
sha256 = "1f4f1jk9mrgd0a1xpjxahasbwd2x2kah53jkjfkimif120ynqqdg"; sha256 = "13ias6gykv1spa3h80316n13yq4ldq6az3h89h656hx2law024g5";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-dateutil-2.9.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-dateutil-2.9.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-dateutil"; name = "mingw-w64-clang-x86_64-python-dateutil";
sha256 = "15zbs5jxh2id2hdskprf0p85nh4y1bgngwgbq482hc31nq5gsls1"; sha256 = "14i6jqkjs0ca9zahsdd6pq7fxci441cfi15dd57l6cd8cy5g3bfm";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-wcwidth-0.2.13-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-wcwidth-0.2.13-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-wcwidth"; name = "mingw-w64-clang-x86_64-python-wcwidth";
sha256 = "0c1k6kqfgirlm0xqigajbx6fv51v0lm95y1g39w1klij2dq4jk5q"; sha256 = "1lcp01bsqcnc1rrf9n5s76wxj8d2ascxpd94fy0084bhvjklf17z";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-prettytable-3.10.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-prettytable-3.11.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-prettytable"; name = "mingw-w64-clang-x86_64-python-prettytable";
sha256 = "1d0xx49bacqz1b55q8yp13pkfj8yhfsazibk6zlmld5ac7blk6cw"; sha256 = "0dg1703r0cq2kq0qsnzz0yaqvnsrdg1bdzws2p7rwpm7ddbm4kla";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-colorama-0.4.6-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-colorama-0.4.6-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-colorama"; name = "mingw-w64-clang-x86_64-python-colorama";
sha256 = "10mw2pirqrw3gk28alnk6l29v4b3z3w45xlr8fvzdbpvzhfrwgkn"; sha256 = "1k1qkaxad25k7c2ybph084c3nbvx0akbv4y078hkav2hff7mdbah";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-tqdm-4.66.2-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-tqdm-4.67.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-tqdm"; name = "mingw-w64-clang-x86_64-python-tqdm";
sha256 = "1ag9wr3xpq63naa2c45lz3csvwkkq8plxf0ajxfbb2chh67jspwq"; sha256 = "1x452k3byk8pkh40m0jblim1797vkxby15289vmddnjac4hmmyp8";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -421,87 +427,87 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libgit2-1.7.2-3-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libgit2-1.8.4-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libgit2"; name = "mingw-w64-clang-x86_64-libgit2";
sha256 = "161ky0l2gljpiphgy0fihw8d6a09ay95v78as60riasmmj6n027j"; sha256 = "0ffv4cs2m6fkw2g6pnb3h5w47bp71l4q6l5lam3phvbibsa1wmk5";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-ply-3.11-4-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pycparser-2.22-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-ply";
sha256 = "01shxamb2sm761nmy0zqakv57zn93kmck2sk9phvcjnlc6h776jr";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pycparser-2.21-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pycparser"; name = "mingw-w64-clang-x86_64-python-pycparser";
sha256 = "0qnjqlqz1qbklhyl65whxfm2l6p1imrjqc7kpqc1rx92fm59pbp8"; sha256 = "1f8m0lfv3fhqi4skb440rqfl2lx43bjqg2vg4f9whb0df7n63y8c";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-cffi-1.16.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-cffi-1.17.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-cffi"; name = "mingw-w64-clang-x86_64-python-cffi";
sha256 = "0ymgaaynxsdra8cr10gvym5wgk5c4vjsnwlq4pzy7g55v4gn0piz"; sha256 = "1pr84r0z1wdmlhimck7pl9qv3g9anhm3896y8yz47f77lp899sb8";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pygit2-1.14.1-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pygit2-1.16.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pygit2"; name = "mingw-w64-clang-x86_64-python-pygit2";
sha256 = "0wbzlbfcyl4i55xf3chfjpwhwj5jqg4pqv3m5qcslmm573xfyki5"; sha256 = "0rykskvn8px62ifpcy1qaacln6v6ap5m232fnnp5h34lz88hajkf";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-llvmlite-0.42.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-llvmlite-0.43.0-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-llvmlite"; name = "mingw-w64-clang-x86_64-python-llvmlite";
sha256 = "0qw88ickp41jvgxvf1dfhn5yz7zsn9q51ra3m522hx1lbqixgn8z"; sha256 = "1hdqgpwbznxyh1z82fzabzlh99kfyii3h7srdl4sdxdw0h476b4i";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-rapidfuzz-3.6.2-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-rapidfuzz-3.6.2-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-rapidfuzz"; name = "mingw-w64-clang-x86_64-python-rapidfuzz";
sha256 = "10mc1h0hcd0mmf9hj0ynl9mfjihliaj0a61q2d087v5fbwf8v0kn"; sha256 = "017ls3za85rvm8d75wwpnd2cry1xgrlwsqkz0x896q4s8gsfh043";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-levenshtein-0.25.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-levenshtein-0.25.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-levenshtein"; name = "mingw-w64-clang-x86_64-python-levenshtein";
sha256 = "0bwx8q9lv8i2ax8y5yw7pn5gzp804rqc55ijdkw83my33l1758wa"; sha256 = "0mgj825a0pygaw8f1almf3sa8nz8npyfjqizga6935lsizxxz19i";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lmdb-0.9.31-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lmdb-0.9.33-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-lmdb"; name = "mingw-w64-clang-x86_64-lmdb";
sha256 = "1gz4b261klr37xb56kj5ybymrsh6q237wkssmkjg32dy511asbiw"; sha256 = "0vmih3yhady422c6kpa0mzj1iv7ywd6xawzsz1zv46kcr88ylrsb";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-lmdb-1.4.1-3-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-lmdb-1.4.1-4-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-lmdb"; name = "mingw-w64-clang-x86_64-python-lmdb";
sha256 = "08b8pja1vhh7z0nrccr01qyfpkjqq8400ra0nvhpincwlaw5rcwn"; sha256 = "0gqgbr7qbhi2pbaxr78ysk3a0zip2jwdwdsdid9ql8sw1i7l572c";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.7-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-platformdirs-4.3.6-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-platformdirs";
sha256 = "1qplr2qhji7s7dgcb8i6lfhm54lj5az2whh5sm02rkbg5sav6xlf";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.9-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libxml2"; name = "mingw-w64-clang-x86_64-libxml2";
sha256 = "1clsdi9c12q964xm8gsb3imff7wvcr8pvpvwp2mhkl4g7mi67qxh"; sha256 = "1b1r5llgqv88id8iwhqh23qwqmn5ic9hdamdc8xzij9hmcvdmmci";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-llvm-libs"; name = "mingw-w64-clang-x86_64-llvm-libs";
sha256 = "1i8v57pnll233r6c0aypp1niyhin550i4am2fa8spsgxhjzlapq0"; sha256 = "1f3lx3a050h9274rl2lfhjfbr1knyxjh5ndw6y8g5ba6dr783civ";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-lld"; name = "mingw-w64-clang-x86_64-lld";
sha256 = "11a5p3d0m9n52dqvgjs9sai4w7qmnqp943jncnp0nn3w5iff3w6z"; sha256 = "00344c98z4q9vsdkw44ja9vmlf15yq1pa8q15dk8sdihcajq2p1i";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-llvm"; name = "mingw-w64-clang-x86_64-llvm";
sha256 = "1v6v725sxifnvfrfsabv7qiw3nm9j14y14aw7wl92338mbw1nd3z"; sha256 = "1srjqw6njywny38igc11nyyh8fh16bm983ik3y62j024jbzacb2l";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -529,9 +535,9 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libftdi-1.5-7-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libftdi-1.5-10-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libftdi"; name = "mingw-w64-clang-x86_64-libftdi";
sha256 = "1il49b4mqhywgl49h27227xbw96af1wz7kpaawhh4qkym3rxqkzd"; sha256 = "021ywl40967f565nhspmbcghfmgc59cdjcki3jsrp12i3lil2jjp";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -541,9 +547,9 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-capstone-5.0.1-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-capstone-5.0.3-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-capstone"; name = "mingw-w64-clang-x86_64-capstone";
sha256 = "0xdg50a43jjqqy63x69ns25blk6vz93lylj27cd78f6fcda75hpg"; sha256 = "1pzrwcvdns1npn4nslbkhf42vircncs47qzx178gx8nldf7zzlvy";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -559,56 +565,80 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-attrs-23.2.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-attrs-23.2.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-attrs"; name = "mingw-w64-clang-x86_64-python-attrs";
sha256 = "0bcmz0b0s18s0pwpkvv6g7hph7bvr9mgyips409kkazw168iikab"; sha256 = "0mzlrasngafkwp22wg2gb1x3rkvz12szcn7na0vgm74zw4f4k5v9";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-multidict-6.0.5-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-rpds-py-0.21.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-rpds-py";
sha256 = "1sqxv0bvfimdpa165ra4xv3d8v73sv6rrc0hm1pazmfb6p8w93p4";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-referencing-0.35.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-referencing";
sha256 = "01is7kj3bav4c9hw7y1r97k8l42mi1iypch0p2s40s6yq8fzj5kd";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-jsonschema-specifications-2023.12.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-jsonschema-specifications";
sha256 = "04hfiq9y6q7myd1qfbmf7qd910l5rszzm3c3jxgp6zwlii6zhpg3";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-jsonschema-4.22.0-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-jsonschema";
sha256 = "0503d3j2zn3gm6mcgbhx3fi5skvainhc5l259c93hipgckb3vsqc";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-multidict-6.0.5-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-multidict"; name = "mingw-w64-clang-x86_64-python-multidict";
sha256 = "1dx4cxznbih3ijnlmki6x0g8a3q1qg71wmsw7jrd82kwrh31x67i"; sha256 = "175pxgawkjbi14zyfz8agjaxnxs5a14ifv3dq82ic9g8sb9ydk0j";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-idna-3.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-idna-3.8-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-idna"; name = "mingw-w64-clang-x86_64-python-idna";
sha256 = "11wyiz1iad9q5smd42dprymw2670c5swqbigpj2v30zs6nhkabnm"; sha256 = "09qpxm174lqinhxqngy7sirckvvhyzzxr4fcy22jn281mr2n3i9c";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-yarl-1.9.4-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-yarl-1.9.4-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-yarl"; name = "mingw-w64-clang-x86_64-python-yarl";
sha256 = "1n8b0460q526q9w7i53a1jydma81c1sdg9h4ayy030fxx7zsn4id"; sha256 = "0rh6ijk0glrlvqqg3l18a850mvgmwarzd5g42yxjzms5w7xx9052";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-frozenlist-1.4.1-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-frozenlist-1.4.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-frozenlist"; name = "mingw-w64-clang-x86_64-python-frozenlist";
sha256 = "1dny1z3d7ddb01im45fjppvkvxqkpah5dmy8w74y6b21afza4q2a"; sha256 = "1yr2g5gk9jjsd6gjssd3vf7ybvk7vgpsmzzk2lmy5y4kn04fydcw";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-aiosignal-1.3.1-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-aiosignal-1.3.1-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-aiosignal"; name = "mingw-w64-clang-x86_64-python-aiosignal";
sha256 = "0s4lj5sfal2rd2naab1j1qc1wh7qxc4d7blg3z1gxhx2g2lyqln2"; sha256 = "09c7h2fywpqrdxkf82jhy9lzkcn6yy2h78hvw6d3x0wk8hqn9n5p";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-aiohttp-3.9.5-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-aiohttp-3.9.5-3-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-aiohttp"; name = "mingw-w64-clang-x86_64-python-aiohttp";
sha256 = "1ykf2djwnsdaxw0lkq8wivrwfwg3h72kdxfkb96n76nim9gcffim"; sha256 = "03isa78gw491j6lms4qszmabh8d6c20hlxl58r7pgq3zcf5k55cl";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-regex-2023.12.25-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-regex-2024.9.11-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-regex"; name = "mingw-w64-clang-x86_64-python-regex";
sha256 = "1wy6hicjnawh4265wkjpw95l1ji2ggx2z7f6a7wl3flm74fn47nw"; sha256 = "176z3dcy2wwmizqnqz20faimbhck6zrqcwj5am3w4l5wwmf3mxf2";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pybase64-1.3.2-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pybase64-1.3.2-4-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pybase64"; name = "mingw-w64-clang-x86_64-python-pybase64";
sha256 = "0cj217d6xcagxismbwncdfy4px1l2axpn6h9zy3bwkh3bwywssk9"; sha256 = "1gwx81i6pb1c3bnk66qciwb2a0qznvm8jwybaz41d60xirmn603h";
}) })
] ]

1
msys2/comtools_dependencies.txt
View File

@ -1,3 +1,2 @@
mingw-w64-clang-x86_64-python3.11
mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-numpy
mingw-w64-clang-x86_64-python-aiohttp mingw-w64-clang-x86_64-python-aiohttp

4
msys2/default.nix
View File

@ -20,7 +20,7 @@ let
'' ''
export WINEDEBUG=-all export WINEDEBUG=-all
export WINEPATH=Z:${msys2-env}/clang64/bin export WINEPATH=Z:${msys2-env}/clang64/bin
exec ${pkgs.wineWowPackages.stable}/bin/wine64 cmd exec ${pkgs.wineWowPackages.unstable}/bin/wine64 cmd
''; '';
wine-msys2-build = pkgs.writeShellScriptBin "wine-msys2-build" wine-msys2-build = pkgs.writeShellScriptBin "wine-msys2-build"
'' ''
@ -28,7 +28,7 @@ let
export WINEDEBUG=-all export WINEDEBUG=-all
export WINEPATH=Z:${msys2-env}/clang64/bin export WINEPATH=Z:${msys2-env}/clang64/bin
${silenceFontconfig} ${silenceFontconfig}
exec ${pkgs.wineWowPackages.stable}/bin/wine64 $@ exec ${pkgs.wineWowPackages.unstable}/bin/wine64 $@
''; '';
in { in {
inherit wine-msys2; inherit wine-msys2;

23
msys2/make_msys2_packages.sh
View File

@ -6,15 +6,16 @@ cd $(dirname $0)
MSYS2DIR=`pwd`/msys2 MSYS2DIR=`pwd`/msys2
mkdir -p $MSYS2DIR/var/lib/pacman $MSYS2DIR/msys/etc 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://repo.msys2.org/msys/x86_64/pacman-mirrors-20240523-1-any.pkg.tar.zst | tar xvf - -C $MSYS2DIR --zstd
curl -L https://raw.githubusercontent.com/msys2/MSYS2-packages/master/pacman/pacman.conf | \ 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 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 fakeroot pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf -Syy
pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \ pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \
--cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" \ --cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" \
mingw-w64-clang-x86_64-cc mingw-w64-clang-x86_64-python3.11 \ mingw-w64-clang-x86_64-cc \
mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-setuptools > $MSYS2DIR/packages.txt mingw-w64-clang-x86_64-python-numpy \
mingw-w64-clang-x86_64-python-setuptools mingw-w64-clang-x86_64-python-build mingw-w64-clang-x86_64-python-installer > $MSYS2DIR/packages.txt
cat artiq_dependencies.txt comtools_dependencies.txt pythonparser_dependencies.txt sipyco_dependencies.txt | pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \ cat artiq_dependencies.txt comtools_dependencies.txt pythonparser_dependencies.txt sipyco_dependencies.txt | pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf \
--cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" - > $MSYS2DIR/artiq_dependency_packages.txt --cachedir $MSYS2DIR/msys/cache --sync --print-format "%l %n" - > $MSYS2DIR/artiq_dependency_packages.txt
@ -23,7 +24,9 @@ pacman --root $MSYS2DIR --config $MSYS2DIR/etc/pacman.conf --cachedir $MSYS2DIR/
--sync --print-format "%l %n" mingw-w64-clang-x86_64-qt-installer-framework > $MSYS2DIR/qt_ifw_packages.txt --sync --print-format "%l %n" mingw-w64-clang-x86_64-qt-installer-framework > $MSYS2DIR/qt_ifw_packages.txt
function generate_nix_packages_from_pacman() { function generate_nix_packages_from_pacman() {
echo "{ pkgs } : [" > $OUT local in=$1
local out=$2
echo "{ pkgs } : [" > $out
while IFS= read -r line; do while IFS= read -r line; do
read -r url package <<< "$line" read -r url package <<< "$line"
hash=$(nix-prefetch-url $url --name $package) hash=$(nix-prefetch-url $url --name $package)
@ -32,11 +35,11 @@ function generate_nix_packages_from_pacman() {
url = \"$url\"; url = \"$url\";
name = \"$package\"; name = \"$package\";
sha256 = \"$hash\"; sha256 = \"$hash\";
})" >> $OUT })" >> $out
done < $IN done < $in
echo "]" >> $OUT echo "]" >> $out
} }
IN=$MSYS2DIR/packages.txt OUT=msys2_packages.nix generate_nix_packages_from_pacman generate_nix_packages_from_pacman $MSYS2DIR/packages.txt msys2_packages.nix
IN=$MSYS2DIR/qt_ifw_packages.txt OUT=msys2_qt_ifw_packages.nix generate_nix_packages_from_pacman generate_nix_packages_from_pacman $MSYS2DIR/qt_ifw_packages.txt msys2_qt_ifw_packages.nix
IN=$MSYS2DIR/artiq_dependency_packages.txt OUT=artiq_dependency_packages.nix generate_nix_packages_from_pacman generate_nix_packages_from_pacman $MSYS2DIR/artiq_dependency_packages.txt artiq_dependency_packages.nix

134
msys2/msys2_packages.nix
View File

@ -1,15 +1,15 @@
{ pkgs } : [ { pkgs } : [
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libunwind-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libunwind"; name = "mingw-w64-clang-x86_64-libunwind";
sha256 = "1krbm0ysv5qg3g2y5zj0wfqy8n1ni6pfqpv57xp8bbzrai16hrbs"; sha256 = "0xsp7ksyqxzdcgjrl18mg3djil12vk7jf3l02h9l6d753waqf4f3";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libc++-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libc++"; name = "mingw-w64-clang-x86_64-libc++";
sha256 = "1msgipk6x6pn5ji9iykgz6cm7cm1a2fmvpa8k5m76xk78ijb6cmj"; sha256 = "1m50hbb6v5g13747gb6l6wzjxy1fxgdd4zhd30fni2zfnnzlrhd1";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -31,9 +31,9 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-xz-5.6.2-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-xz-5.6.3-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-xz"; name = "mingw-w64-clang-x86_64-xz";
sha256 = "0phb9hwqksk1rg29yhwlc7si78zav19c2kac0i841pc7mc2n9gzx"; sha256 = "09cbqivx9afh7wnqi5iiyrbhnv3y2qc9h1brm420sjpaqhz4prkv";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -43,9 +43,9 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.7-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.9-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libxml2"; name = "mingw-w64-clang-x86_64-libxml2";
sha256 = "1clsdi9c12q964xm8gsb3imff7wvcr8pvpvwp2mhkl4g7mi67qxh"; sha256 = "1b1r5llgqv88id8iwhqh23qwqmn5ic9hdamdc8xzij9hmcvdmmci";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -55,69 +55,69 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-libs-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-llvm-libs"; name = "mingw-w64-clang-x86_64-llvm-libs";
sha256 = "1i8v57pnll233r6c0aypp1niyhin550i4am2fa8spsgxhjzlapq0"; sha256 = "1f3lx3a050h9274rl2lfhjfbr1knyxjh5ndw6y8g5ba6dr783civ";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-llvm"; name = "mingw-w64-clang-x86_64-llvm";
sha256 = "1v6v725sxifnvfrfsabv7qiw3nm9j14y14aw7wl92338mbw1nd3z"; sha256 = "1srjqw6njywny38igc11nyyh8fh16bm983ik3y62j024jbzacb2l";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-libs-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-libs-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-clang-libs"; name = "mingw-w64-clang-x86_64-clang-libs";
sha256 = "1czvclkbdh8gaqcjylwkyplckyqyfzvbvw155cra8ix17nqf8bna"; sha256 = "1aj1l07j7q1n5wbqarwss744h5p31vrlkip9995b2c4fv7bvkx08";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-compiler-rt-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-compiler-rt-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-compiler-rt"; name = "mingw-w64-clang-x86_64-compiler-rt";
sha256 = "1c95vr6940jafgp3kf2530wd675cxgk1iwryhm371i5k9lx6m6n4"; sha256 = "0q4mp7qfwfwkmb1g9jchxz2jz6lcxrgkv4pwblgy4pn6bqxwjqa5";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-headers-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-headers-git-12.0.0.r387.gcf5c50cce-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-headers-git"; name = "mingw-w64-clang-x86_64-headers-git";
sha256 = "02awrl51w0s38ghad0gy201qyxllbh15hkw1kkd7pdc89lmv0kyf"; sha256 = "1k9ydhadm0gmas6jpr128vfz4a2yllq9f8sdb55zaklk9j4099gv";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-crt-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-crt-git-12.0.0.r387.gcf5c50cce-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-crt-git"; name = "mingw-w64-clang-x86_64-crt-git";
sha256 = "0wxr57ls7lx05s38r5p4a6w27l98knq9fmf8a54cicmfkaw2nk2n"; sha256 = "1vmlfmy79hbvm4q8kbsyylj99pcnvvay9jb9642rn7vjfripnxni";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-lld-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-lld"; name = "mingw-w64-clang-x86_64-lld";
sha256 = "11a5p3d0m9n52dqvgjs9sai4w7qmnqp943jncnp0nn3w5iff3w6z"; sha256 = "00344c98z4q9vsdkw44ja9vmlf15yq1pa8q15dk8sdihcajq2p1i";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libwinpthread-git-12.0.0.r387.gcf5c50cce-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libwinpthread-git"; name = "mingw-w64-clang-x86_64-libwinpthread-git";
sha256 = "0yqrzvnqs8zr6whazp9q4r74viq0440ikvql92zj5zg9yzm507zl"; sha256 = "14q908glsqrbkk932mynvj2jm154v0ywndbn4a7s734fn8xs5hmq";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-winpthreads-git-12.0.0.r1.gdc42231f0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-winpthreads-git-12.0.0.r387.gcf5c50cce-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-winpthreads-git"; name = "mingw-w64-clang-x86_64-winpthreads-git";
sha256 = "1rd5dg8qqyw48m7fhlm0d0fqhlska3aycrjd0ncw0b25gj7d3ml5"; sha256 = "02yppwp6wllfl3fcd29zw3vkdzvhhmmyh43ghfgygv69c0nlrvqn";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-clang-19.1.3-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-clang"; name = "mingw-w64-clang-x86_64-clang";
sha256 = "15kd2l7hkap9vs1z25zs2dr8bl2hv9m2761xj1ny0michkwpq96b"; sha256 = "1cwl7qzlwdmg8qfxj8x7xzfvajn6w6y97k5n4bcw5kas00l5mb79";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-expat-2.6.2-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-expat-2.6.4-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-expat"; name = "mingw-w64-clang-x86_64-expat";
sha256 = "0kj1vzjh3qh7d2g47avlgk7a6j4nc62111hy1m63jwq0alc01k38"; sha256 = "03fp2yacv7gk0g049lffz6pbj93vpjmzqxxa312d4gxczi57nqdv";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -133,27 +133,27 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libtre-git-r177.07e66d0-2-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libtre-0.9.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libtre-git"; name = "mingw-w64-clang-x86_64-libtre";
sha256 = "0fc9hxsdks1xy5fv0rcna433hlzf6jhs77hg0hfzkzhn06f9alp4"; sha256 = "1y5d2cbkpd0ngqlsv6hvz47nxb1wry33i5s1clg2k53yhgjkg8vv";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libsystre-1.0.1-5-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libsystre-1.0.1-6-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libsystre"; name = "mingw-w64-clang-x86_64-libsystre";
sha256 = "05qsn8fkks4f93jkas43s47axqqgx5m64b45p462si3nlb8cjirq"; sha256 = "19c71fs5gqjrf88mv7l702fjg228xd9lfbxg0mkzm3ljvv4ljn0q";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-ncurses-6.4.20231217-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-ncurses-6.5.20240831-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-ncurses"; name = "mingw-w64-clang-x86_64-ncurses";
sha256 = "00046d52zsr8zjifl7h22jfihhh53h20ipvbqmvf9myssw2fwjza"; sha256 = "1hlfj9g4s767s502sawwbcv4a0xd3ym3ip4jswmhq48wh5050iyb";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openssl-3.3.1-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openssl-3.4.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-openssl"; name = "mingw-w64-clang-x86_64-openssl";
sha256 = "0ywhwm4kw3qjzv0872qwabnsq2rzbmqjb9m69q3fykjl0m9gigsa"; sha256 = "0cgiqjmgdnwnv9r88z634dmqrzh06dmsfncyzymw0s16nnv2k7k2";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -163,9 +163,9 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-readline-8.2.010-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-readline-8.2.013-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-readline"; name = "mingw-w64-clang-x86_64-readline";
sha256 = "1s47pd5iz8y3hspsxn4pnp0v3m05ccia40v5nfvx0rmwgvcaz82v"; sha256 = "0pv1ypqfgm4mimzr0amq9anr1ysqmzrwv6gfk7rrlzhihadknsvr";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -175,9 +175,9 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-sqlite3-3.46.0-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-sqlite3-3.46.1-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-sqlite3"; name = "mingw-w64-clang-x86_64-sqlite3";
sha256 = "0q676i2z5nr4c71jnd4z5qz9xa1xryl0cpi84w74yvd0p4qiz7y2"; sha256 = "1axplxyjnaz411qzjjqwbj55fbrh4akq3plm2p1sx64jp844xpyq";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
@ -187,38 +187,62 @@
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tzdata-2024a-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-tzdata-2024b-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-tzdata"; name = "mingw-w64-clang-x86_64-tzdata";
sha256 = "1lsfn3759cyf56zlmfvgy6ihs4iks6zhlnrbfmnq5wml02k936ji"; sha256 = "0jihnr1i7vyzczxz60ds1x3gcm3p4ad2pq9d5vvpwjdwrxkvxmkc";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-3.11.9-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-3.12.7-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python"; name = "mingw-w64-clang-x86_64-python";
sha256 = "0ah1idjqxg7jc07a1gz9z766rjjd0f0c6ri4hpcsimsrbj1zjd3c"; sha256 = "1c71xm6dp700qw1vzwy97bqk5093yhhzvk8p498z2zdn92s1dxj9";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-openmp-18.1.6-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-llvm-openmp-19.1.3-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-llvm-openmp"; name = "mingw-w64-clang-x86_64-llvm-openmp";
sha256 = "0zqxln0f7hsv4zw70br7jzank9flrf5aj2vvf5kndq24x22avzng"; sha256 = "1d5zdr9sy8ffn4p4ia5c7xgxa4dsrpl79brx0hlfw0xyjrm0nxlr";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openblas-0.3.27-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-openblas-0.3.28-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-openblas"; name = "mingw-w64-clang-x86_64-openblas";
sha256 = "06ygz1wa488wqvmxbn74b0fyan4wf3lb6kbwfampgikd1gijww2k"; sha256 = "1pskcqc1lg9p8m8rk7bw3mz7mn7vw5fpl7zxa23bhjn02p5b79qq";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-1.26.4-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-numpy-2.1.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-numpy"; name = "mingw-w64-clang-x86_64-python-numpy";
sha256 = "00h0ap954cjwlsc3p01fjwy7s3nlzs90v0kmnrzxm0rljmvn4jkf"; sha256 = "1kiy7ail04ias47xbbhl9vpsz02g0g3f29ncgx5gcks9vgqldp6m";
}) })
(pkgs.fetchurl { (pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-setuptools-69.1.1-1-any.pkg.tar.zst"; url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-setuptools-75.3.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-setuptools"; name = "mingw-w64-clang-x86_64-python-setuptools";
sha256 = "1mc56anasj0v92nlg84m3pa7dbqgjakxw0b4ibqlrr9cq0xzsg4b"; sha256 = "1cph081zr7m0qp66b9v2zq69a9inavbzvwgwx4mmzklnpbrly5yv";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-packaging-24.2-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-packaging";
sha256 = "1m6pcrzpv80mvnsv770da7q71drc5nha636qlsjl5qvfzxi6hgfd";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyproject-hooks-1.1.0-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pyproject-hooks";
sha256 = "02nqna5d9nxzy8xcbbjgsmrrp6nhaa8bp06107ngmn7yjwg75a5p";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-build-1.2.2-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-build";
sha256 = "1fbkkahvfy6x6qrnxvp4qlvmwgziv5xnfy6dx6av31r7iv4q51fb";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-installer-0.7.0-4-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-installer";
sha256 = "0fqq4wvxp72syax62b1inb5p3dsazp4jr2h5kd2gg9wi7x3nbx6n";
}) })
] ]

1
msys2/sipyco_dependencies.txt
View File

@ -1,3 +1,2 @@
mingw-w64-clang-x86_64-python3.11
mingw-w64-clang-x86_64-python-numpy mingw-w64-clang-x86_64-python-numpy
mingw-w64-clang-x86_64-python-pybase64 mingw-w64-clang-x86_64-python-pybase64