M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

update dependencies

This commit is contained in:
Sebastien Bourdeauducq 2021-11-03 21:39:44 +08:00
parent 977543e05a
commit 9a1a8e0e81
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
flake.lock
View File

@ -3,11 +3,11 @@
"mozilla-overlay": { "mozilla-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1629225446, "lastModified": 1634833229,
"narHash": "sha256-HJX4Pc5ZUAg4apxB/XHuJ+6ukzvRQqeZMjscOBst2bA=", "narHash": "sha256-uDbVCkW91/AY87mTwm8XrX2E133LTFqwYsYNNxBcY9M=",
"owner": "mozilla", "owner": "mozilla",
"repo": "nixpkgs-mozilla", "repo": "nixpkgs-mozilla",
"rev": "0510159186dd2ef46e5464484fbdf119393afa58", "rev": "6070a8ee799f629cb1d0004821f77ceed94d3992",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -18,11 +18,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1634758644, "lastModified": 1635946136,
"narHash": "sha256-H3UW/msC6wadg28lcgZv2Ge/P7dWxesL6i37a0GOeyM=", "narHash": "sha256-y1l0FK/nyRqb9CCImHNDJYYTtCnSNF2rK5RFc+qaMEg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "70904d4a9927a4d6e05c72c4aaac4370e05107f3", "rev": "8429ae8722a319ebc26e9a38105e0797a824eb87",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,11 +60,11 @@
"src-misoc": { "src-misoc": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1634799783, "lastModified": 1635235511,
"narHash": "sha256-CbeXsLTwwYBWb5cfrVVYkcQYV207gi9+CQhzfeZbXGc=", "narHash": "sha256-XdBMBfup7JbUPzBi0An8GnQCIp7tiaczTrOwsPpvKCM=",
"ref": "master", "ref": "master",
"rev": "855914deace34880c69589022c52a8921f431063", "rev": "34e545c190e08ada3f59712bdb71208ac6c39cbc",
"revCount": 2375, "revCount": 2397,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/misoc.git" "url": "https://github.com/m-labs/misoc.git"
@ -82,11 +82,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1633622662, "lastModified": 1635932388,
"narHash": "sha256-AEWqSxdl2aIibv7vtU9vDMu8ytdOY10fwBaM77+Il64=", "narHash": "sha256-f8OEkvTqE3q+xgxjgO3Dnfi+neplozfJNrtBcPcMqg8=",
"ref": "master", "ref": "master",
"rev": "79d3c5caae79fe15f41d2b2248cad2344389555f", "rev": "36e4028f5bf4307b8deabcc3768af2708728cede",
"revCount": 340, "revCount": 387,
"type": "git", "type": "git",
"url": "https://git.m-labs.hk/M-Labs/nac3.git" "url": "https://git.m-labs.hk/M-Labs/nac3.git"
}, },

18
flake.nix
View File

@ -77,7 +77,7 @@
nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ]; nativeBuildInputs = [ pkgs.qt5.wrapQtAppsHook ];
# keep llvm_x and lld_x in sync with nac3 # keep llvm_x and lld_x in sync with nac3
propagatedBuildInputs = [ pkgs.llvm_11 pkgs.lld_11 src-nac3.packages.x86_64-linux.nac3artiq sipyco ] propagatedBuildInputs = [ pkgs.llvm_12 pkgs.lld_12 src-nac3.packages.x86_64-linux.nac3artiq sipyco ]
++ (with pkgs.python3Packages; [ pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 qasync ]); ++ (with pkgs.python3Packages; [ pyqtgraph pygit2 numpy dateutil scipy prettytable pyserial h5py pyqt5 qasync ]);
dontWrapQtApps = true; dontWrapQtApps = true;
@ -94,8 +94,8 @@
"--set FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf" "--set FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf"
]; ];
# FIXME: automatically propagate lld_11 llvm_11 dependencies # FIXME: automatically propagate lld_12 llvm_12 dependencies
checkInputs = [ pkgs.lld_11 pkgs.llvm_11 ]; checkInputs = [ pkgs.lld_12 pkgs.llvm_12 ];
checkPhase = '' checkPhase = ''
python -m unittest discover -v artiq.test python -m unittest discover -v artiq.test
''; '';
@ -190,9 +190,9 @@
(pkgs.python3.withPackages(ps: [ migen misoc artiq ])) (pkgs.python3.withPackages(ps: [ migen misoc artiq ]))
rustPlatform.rust.rustc rustPlatform.rust.rustc
rustPlatform.rust.cargo rustPlatform.rust.cargo
pkgs.llvmPackages_11.clang-unwrapped pkgs.llvmPackages_12.clang-unwrapped
pkgs.llvm_11 pkgs.llvm_12
pkgs.lld_11 pkgs.lld_12
vivado vivado
rustPlatform.cargoSetupHook rustPlatform.cargoSetupHook
cargo-xbuild cargo-xbuild
@ -309,9 +309,9 @@
rustPlatform.rust.rustc rustPlatform.rust.rustc
rustPlatform.rust.cargo rustPlatform.rust.cargo
cargo-xbuild cargo-xbuild
pkgs.llvmPackages_11.clang-unwrapped pkgs.llvmPackages_12.clang-unwrapped
pkgs.llvm_11 pkgs.llvm_12
pkgs.lld_11 pkgs.lld_12
# use the vivado-env command to enter a FHS shell that lets you run the Vivado installer # use the vivado-env command to enter a FHS shell that lets you run the Vivado installer
packages.x86_64-linux.vivadoEnv packages.x86_64-linux.vivadoEnv
packages.x86_64-linux.vivado packages.x86_64-linux.vivado