bradbqc/artiq-extrapkg
1
0
Fork 0
forked from M-Labs/artiq-extrapkg
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: bradbqc:master
Branches Tags
bradbqc:master
bradbqc:release-8
bradbqc:release-7
M-Labs:master
M-Labs:release-8
M-Labs:release-7
..
compare: bradbqc:release-8
Branches Tags
bradbqc:release-8
bradbqc:master
bradbqc:release-7
M-Labs:master
M-Labs:release-8
M-Labs:release-7

9 Commits
master ... release-8

Author SHA1 Message Date
Sebastien Bourdeauducq
6a1854f18b flake: update dependencies 2024-07-31 17:44:41 +08:00
Florian Agbuya
763df7d869 msys2: update 2024-07-26 18:51:21 +08:00
Florian Agbuya
85173d4e70 remove scipy from artiq dependencies 2024-07-26 18:50:58 +08:00
Egor Savkin
5e1fcbdce2 Update flake and msys2 packages 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-07-15 15:30:10 +08:00
Sebastien Bourdeauducq
32e512e10d flake: update dependencies 2024-07-10 10:43:58 +02:00
Sebastien Bourdeauducq
8cf0c2a2dd flake: update dependencies 2024-06-19 12:48:55 +08:00
Sebastien Bourdeauducq
deebcb2af3 flake: update dependencies 2024-06-06 13:55:10 +08:00
Egor Savkin
be72649af9 Follow stable branch for release-8 
Signed-off-by: Egor Savkin <es@m-labs.hk>
 2024-06-06 12:01:07 +08:00
Sebastien Bourdeauducq
08e013d8cc flake: follow ARTIQ release-8 2024-06-06 10:21:58 +08:00
6 changed files with 98 additions and 92 deletions
Show Stats Expand all files Collapse all files

70
flake.lock generated
View File

@ -13,11 +13,11 @@
]
},
"locked": {
"lastModified": 1720768567,
"narHash": "sha256-3VoK7o5MtHtbHLrc6Pv+eQWFtaz5Gd/YWyV5TD3c5Ss=",
"lastModified": 1717637438,
"narHash": "sha256-BXFidNm3Em8iChPGu1L0s2bY+f2yQ0VVid4MuOoTehw=",
"owner": "m-labs",
"repo": "artiq-comtools",
"rev": "f93570d8f2ed5a3cfb3e1c16ab00f2540551e994",
"rev": "78d27026efe76a13f7b4698a554f55811369ec4d",
"type": "github"
},
"original": {
@ -59,23 +59,24 @@
"artiqpkgs": {
"inputs": {
"artiq-comtools": "artiq-comtools",
"mozilla-overlay": "mozilla-overlay",
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay",
"sipyco": "sipyco",
"src-migen": "src-migen",
"src-misoc": "src-misoc",
"src-pythonparser": "src-pythonparser"
},
"locked": {
"lastModified": 1722417433,
"narHash": "sha256-QEbcVdL1sUQEbMCvCUvPM8DKqwOth3gJpdiLTf4hPN8=",
"ref": "refs/heads/master",
"rev": "0623480c82c28d57e14dc4f363374758a52284d3",
"revCount": 8952,
"lastModified": 1722417470,
"narHash": "sha256-f+Qa/lRi46BoHf9CdZFASyW9iOiwzJ/XFOxpAcTnYmw=",
"ref": "release-8",
"rev": "4e800af410341240f08d5071182752eb2d60ca94",
"revCount": 8926,
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
},
"original": {
"ref": "release-8",
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
}
@ -187,18 +188,34 @@
"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": {
"locked": {
"lastModified": 1721924956,
"narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
"lastModified": 1720386169,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5ad6a14c6bf098e98800b091668718c336effc95",
"rev": "194846768975b7ad2c4988bdb82572c00222c0d7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
@ -209,27 +226,6 @@
"daxpkgs": "daxpkgs"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"artiqpkgs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1722046723,
"narHash": "sha256-G7/gHz8ORRvHd1/RIURrdcswKRPe9K0FsIYR4v5jSWo=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "56baac5e6b2743d4730e664ea64f6d8a2aad0fbb",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"sipyco": {
"inputs": {
"nixpkgs": [
@ -254,11 +250,11 @@
"src-migen": {
"flake": false,
"locked": {
"lastModified": 1721561053,
"narHash": "sha256-z3LRhNmKZrjr6rFD0yxtccSa/SWvFIYmb+G/D5d2Jd8=",
"lastModified": 1720332047,
"narHash": "sha256-FdYVEHVtXHrzPhBqpXOTo9uHQAtuCsDPmAPY8JrfHOY=",
"owner": "m-labs",
"repo": "migen",
"rev": "9279e8623f8433bc4f23ac51e5e2331bfe544417",
"rev": "60739a161e64630ce7ba62d1a5bac1252b66c3b9",
"type": "github"
},
"original": {

49
flake.nix
View File

@ -1,7 +1,7 @@
{
description = "Additional packages for ARTIQ";
inputs.artiqpkgs.url = git+https://github.com/m-labs/artiq.git;
inputs.artiqpkgs.url = git+https://github.com/m-labs/artiq.git?ref=release-8;
inputs.daxpkgs = {
url = git+https://gitlab.com/duke-artiq/dax.git;
@ -27,8 +27,8 @@
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.
condaInstaller = pkgs.fetchurl {
url = "https://repo.anaconda.com/archive/Anaconda3-2024.06-1-Linux-x86_64.sh";
sha256 = "1xx8a7jmyd93lkj9zvhmdn66zv10k421n6zszp85imsjk8yv96sk";
url = "https://repo.anaconda.com/archive/Anaconda3-2024.02-1-Linux-x86_64.sh";
sha256 = "sha256-xTbdt7S6c4vdvU5YGykwjLMy+hKuP6LNZoFL1zXf8jE=";
};
condaInstallerEnv = pkgs.buildFHSEnv {
name = "conda-installer-env";
@ -50,7 +50,7 @@
installPhase =
''
conda-installer-env -c "./conda-installer.sh -p $out -b"
substituteInPlace $out/lib/python3.12/site-packages/conda/gateways/disk/__init__.py \
substituteInPlace $out/lib/python3.11/site-packages/conda/gateways/disk/__init__.py \
--replace "os.chmod(path, 0o2775)" "pass"
'';
};
@ -211,9 +211,27 @@
# no unit tests without hardware so do a simple smoke test
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;
dax = daxpkgs.packages.x86_64-linux.dax.overridePythonAttrs (oa: {
nativeBuildInputs = (oa.nativeBuildInputs or []) ++ [ pkgs.qt6.wrapQtAppsHook ];
nativeBuildInputs = (oa.nativeBuildInputs or []) ++ [ pkgs.qt5.wrapQtAppsHook ];
doCheck = false;
});
trap-dac-utils = daxpkgs.packages.x86_64-linux.trap-dac-utils;
@ -225,10 +243,10 @@
rev = "0f0196b6941b0c44a33c85d8c02047ca65466463";
sha256 = "0mx6yjvprhdnkdigwns8mg6v5daqxpgbv7mf63fa76i1iv2wvak4";
};
nativeBuildInputs = [ pkgs.qt6.wrapQtAppsHook ];
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
dontWrapQtApps = true;
propagatedBuildInputs = [ artiqpkgs.packages.x86_64-linux.artiq ]
++ (with pkgs.python3Packages; [ numpy pyqt6 pyqtgraph ]);
++ (with pkgs.python3Packages; [ numpy pyqt5 pyqtgraph ]);
doCheck = false;
};
linien-client = pkgs.python3Packages.buildPythonPackage rec {
@ -264,7 +282,7 @@
postInstall =
''
# conflicts with linien-client
rm -rf $out/lib/python3.12/site-packages/linien/__pycache__
rm -rf $out/lib/python3.11/site-packages/linien/__pycache__
'';
};
# replace broken (as usual) setuptools launcher
@ -373,6 +391,12 @@
src = hut2.src;
dependencies = [ "sipyco" ];
}
{
name = "wand";
version = wand.version;
src = wand.src;
dependencies = [ "artiq" "qasync" "numpy" "scipy" "influxdb" ];
}
{
name = "flake8-artiq";
version = flake8-artiq.version;
@ -511,12 +535,6 @@
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 = ./.;
buildInputs = [ pkgs.gnutar pkgs.zstd pkgs.pacman pkgs.fakeroot ];
phases = [ "installPhase" ];
@ -525,13 +543,12 @@
mkdir $out
mkdir -p tmp/cache
tar -xvf ${msys2-base} --strip-components=1 -C $out/ msys64
printf "\n[artiq]\nSigLevel = Optional TrustAll\nServer = https://msys2.m-labs.hk/artiq-beta\n" >> $out/etc/pacman.conf
printf "\n[artiq]\nSigLevel = Optional TrustAll\nServer = https://msys2.m-labs.hk/artiq\n" >> $out/etc/pacman.conf
cat $out/etc/pacman.conf | sed -e "s|/etc/pacman.d|$out/etc/pacman.d|g" -e "s|SigLevel = Required|SigLevel = Never|g" -e "s|CheckSpace||g" > tmp/pacman.conf
sed -i '/\[mingw32\]/,/^$/d; /\[clang32\]/,/^$/d; /\[mingw64\]/,/^$/d; /\[ucrt64\]/,/^$/d; /\[clangarm64\]/,/^$/d;' $out/etc/pacman.conf
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 --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
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/mingw32* $out/var/lib/pacman/sync/ucrt64* \

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

@ -35,7 +35,6 @@ function createShortcuts()
}
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",
["@TargetDir@\\usr\\bin\\bash.exe", "--login", "-c", "exit"]);

4
msys2/artiq_dependencies.txt
View File

@ -1,7 +1,7 @@
mingw-w64-clang-x86_64-python3.11
mingw-w64-clang-x86_64-python-h5py
mingw-w64-clang-x86_64-python-pyqt6
mingw-w64-clang-x86_64-qt6-svg
mingw-w64-clang-x86_64-python-pyqt5
mingw-w64-clang-x86_64-qt5-svg
mingw-w64-clang-x86_64-python-qasync
mingw-w64-clang-x86_64-python-pyqtgraph
mingw-w64-clang-x86_64-python-numpy

62
msys2/artiq_dependency_packages.nix
View File

@ -229,9 +229,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.9.0-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-curl-8.8.0-10-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-curl";
sha256 = "0nnn3pj9l8k66ifi7pxrg6n1fhisdj4klqxnd0xiq8njdbx8f61m";
sha256 = "024z5b1achkf448gxqy1i3gcw371x54kfl6igv08b5wb3rrw35a4";
})
(pkgs.fetchurl {
@ -247,15 +247,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt6-sip-13.8.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pyqt6-sip";
sha256 = "09q4q4kjkyyyf5gn4lili94rz2fqlh8mh022qqwnscfxd5bm6haa";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-double-conversion-3.3.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-double-conversion";
sha256 = "1jd07myjvc0dzwkh84rk7c74wv96syyfb7v99694bbbv31jkqw4g";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-pyqt5-sip-12.15.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-pyqt5-sip";
sha256 = "1y0kaw6x1accd3ixd132gwh08i03cg1whih4iyrqz62p5r1905xw";
})
(pkgs.fetchurl {
@ -264,6 +258,12 @@
sha256 = "0qrp1bsidhq4yabwz6wgz88s3d15w1aiamvpd3hwsjg0wy49mq0g";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-double-conversion-3.3.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-double-conversion";
sha256 = "1jd07myjvc0dzwkh84rk7c74wv96syyfb7v99694bbbv31jkqw4g";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libpng-1.6.43-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libpng";
@ -313,15 +313,15 @@
})
(pkgs.fetchurl {
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-icu";
sha256 = "0dxskyhbqgiphlz95b7hp05kcryaspa045ad8763m903nnslq7ri";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-fontconfig-2.15.0-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-libb2-0.98.1-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libb2";
sha256 = "0555dvb2xs6695sz5ndrx6y0cz3qa5cg0m5v8q1md13ssg76vlh6";
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-icu";
sha256 = "0dxskyhbqgiphlz95b7hp05kcryaspa045ad8763m903nnslq7ri";
})
(pkgs.fetchurl {
@ -343,27 +343,21 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-vulkan-headers-1.3.290.0-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-vulkan-headers";
sha256 = "0zk06zpwpg7ihrwfx402zlmgbhjzwwcynn56w2yggxa1bq3giy6h";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt5-base-5.15.14+kde+r141-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-qt5-base";
sha256 = "009paqlkrmfm851vfb7mm4r0qyyx5cglq8k9lxpr9rqx32v0pmgh";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt6-base-6.7.2-2-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-qt6-base";
sha256 = "0q0rm0ng9qsdd997n1ra1ag8s072f2fmagfhw4h3n1d0prhfn5m3";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt5-5.15.11-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pyqt5";
sha256 = "16hxc8sn6bszlqf4nmrzm02198jsqd1yx4lb8d1r2c54497flbm8";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-python-pyqt6-6.7.1-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-python-pyqt6";
sha256 = "0651vffjrdmhgzylci1c2lz88wb4ngij064bliwjrjm2v6jxbyf9";
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt6-svg-6.7.2-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-qt6-svg";
sha256 = "0rn5m3yf4r42cllwzl60hmscggzmbxc0mgaisjn8dwlrakv211v5";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-qt5-svg-5.15.14+kde+r5-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-qt5-svg";
sha256 = "0di85dzj47200w93ddm2njmhzygz3f77bvan3bj260g7f45i0p1g";
})
(pkgs.fetchurl {
@ -475,9 +469,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.9-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libxml2";
sha256 = "0cjz2vj9yz6k5xj601cp0yk631rrr0z94ciamwqrvclb0yhakf25";
sha256 = "1imipb0dz4w6x4n9arn22imyzzcwdlf2cqxvn7irqq7w9by6fy0b";
})
(pkgs.fetchurl {

4
msys2/msys2_packages.nix
View File

@ -43,9 +43,9 @@
})
(pkgs.fetchurl {
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.9-1-any.pkg.tar.zst";
url = "https://mirror.msys2.org/mingw/clang64/mingw-w64-clang-x86_64-libxml2-2.12.8-1-any.pkg.tar.zst";
name = "mingw-w64-clang-x86_64-libxml2";
sha256 = "0cjz2vj9yz6k5xj601cp0yk631rrr0z94ciamwqrvclb0yhakf25";
sha256 = "1imipb0dz4w6x4n9arn22imyzzcwdlf2cqxvn7irqq7w9by6fy0b";
})
(pkgs.fetchurl {