M-Labs
/
artiq-zynq
9
1
Fork 16
Code Issues 14 Pull Requests 3 Releases Wiki Activity

flake: update dependencies, nixpkgs 23.05

pull/236/head
Sebastien Bourdeauducq 2023-05-27 18:37:19 +08:00
parent 6088e6bb6f
commit ddb3703f50
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
flake.lock
View File

@ -11,11 +11,11 @@
"src-pythonparser": "src-pythonparser" "src-pythonparser": "src-pythonparser"
}, },
"locked": { "locked": {
"lastModified": 1684812390, "lastModified": 1685181798,
"narHash": "sha256-EfgyISjQ44ob3rZb7GfDphOW5zEVi9g3JAzCI5fH1AU=", "narHash": "sha256-pUxlwhxoIMfMkgbVJe3DFBjR5v784RGzfNdBtRKsuy4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "598c7b1d25ecbb496b585ab5e9169b165b2d5b90", "rev": "ef2cc2cc125f0aa5fe6e92d87865b0b0bf1dae4c",
"revCount": 8360, "revCount": 8365,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
}, },
@ -68,11 +68,11 @@
"mozilla-overlay": { "mozilla-overlay": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1677493379, "lastModified": 1684487559,
"narHash": "sha256-A1gO8zlWLv3+tZ3cGVB1WYvvoN9pbFyv0xIJHcTsckw=", "narHash": "sha256-SZcJEM+NnLr8ctzeQf1BGAqBHzJ3jn+tdSeO7lszIJc=",
"owner": "mozilla", "owner": "mozilla",
"repo": "nixpkgs-mozilla", "repo": "nixpkgs-mozilla",
"rev": "78e723925daf5c9e8d0a1837ec27059e61649cb6", "rev": "e6ca26fe8b9df914d4567604e426fbc185d9ef3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -100,11 +100,11 @@
"mozilla-overlay_3": { "mozilla-overlay_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1664789696, "lastModified": 1684487559,
"narHash": "sha256-UGWJHQShiwLCr4/DysMVFrYdYYHcOqAOVsWNUu+l6YU=", "narHash": "sha256-SZcJEM+NnLr8ctzeQf1BGAqBHzJ3jn+tdSeO7lszIJc=",
"owner": "mozilla", "owner": "mozilla",
"repo": "nixpkgs-mozilla", "repo": "nixpkgs-mozilla",
"rev": "80627b282705101e7b38e19ca6e8df105031b072", "rev": "e6ca26fe8b9df914d4567604e426fbc185d9ef3e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -115,16 +115,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1682173319, "lastModified": 1685004253,
"narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=", "narHash": "sha256-AbVL1nN/TDicUQ5wXZ8xdLERxz/eJr7+o8lqkIOVuaE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c", "rev": "3e01645c40b92d29f3ae76344a6d654986a91a91",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.11", "ref": "nixos-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -144,11 +144,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681290481, "lastModified": 1685094262,
"narHash": "sha256-VEZcGhbtJGonRrrWi31evNDVSerlLjEPL0MZGm9VlB8=", "narHash": "sha256-7DvbdTUYP7PbhZClT/tob66iMV95v7124RynMpPc5VA=",
"owner": "m-labs", "owner": "m-labs",
"repo": "sipyco", "repo": "sipyco",
"rev": "727631ada6e59dc6ef0ad50bfcc376d2ffe805aa", "rev": "f1f0fc1d3071c5a6ba6dd613b54bb4176ad1e8dc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -176,11 +176,11 @@
"src-misoc": { "src-misoc": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1679903508, "lastModified": 1685174995,
"narHash": "sha256-TI0agjSSMJtH4mgAMpSO128zxcwSo/AjY1B6AW7zBQQ=", "narHash": "sha256-90UwWt9/TAaFAoYDpiIzHXqMWYfftlps8sodv/Gf07c=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "0cf0ebb7d4f56cc6d44a3dea3e386efab9d82419", "rev": "d83499b318e8ef021b12e2df261707a165eb3afa",
"revCount": 2437, "revCount": 2439,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/misoc.git" "url": "https://github.com/m-labs/misoc.git"
@ -216,11 +216,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1669819016, "lastModified": 1685182853,
"narHash": "sha256-WvNMUekL4Elc55RdqX8XP43QPnBrK8Rbd0bsoI61E5U=", "narHash": "sha256-bEgE8Ph7MEHQr7S+xL33CxLuIm3AqvsaxBwUE1vHTdU=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "67dbb5932fa8ff5f143983476f741f945871d286", "rev": "f20c0082645cfef34575661aeeff8d9c1ed1f127",
"revCount": 624, "revCount": 625,
"type": "git", "type": "git",
"url": "https://git.m-labs.hk/m-labs/zynq-rs" "url": "https://git.m-labs.hk/m-labs/zynq-rs"
}, },

18
flake.nix
View File

@ -12,6 +12,7 @@
zynqpkgs = zynq-rs.packages.x86_64-linux; zynqpkgs = zynq-rs.packages.x86_64-linux;
artiqpkgs = artiq.packages.x86_64-linux; artiqpkgs = artiq.packages.x86_64-linux;
rust = zynq-rs.rust;
rustPlatform = zynq-rs.rustPlatform; rustPlatform = zynq-rs.rustPlatform;
fastnumbers = pkgs.python3Packages.buildPythonPackage rec { fastnumbers = pkgs.python3Packages.buildPythonPackage rec {
@ -49,7 +50,7 @@
nativeBuildInputs = with pkgs.python3Packages; [ pbr ]; nativeBuildInputs = with pkgs.python3Packages; [ pbr ];
propagatedBuildInputs = with pkgs.python3Packages; [ future fastnumbers ]; propagatedBuildInputs = with pkgs.python3Packages; [ future fastnumbers ];
checkInputs = with pkgs.python3Packages; [ pytest pytest-flake8 ]; checkInputs = with pkgs.python3Packages; [ pytest ];
checkPhase = "pytest"; checkPhase = "pytest";
doCheck = false; doCheck = false;
@ -73,8 +74,7 @@
propagatedBuildInputs = with pkgs.python3Packages; [ setuptools click numpy toolz jinja2 ramda artiqpkgs.migen artiqpkgs.misoc ]; propagatedBuildInputs = with pkgs.python3Packages; [ setuptools click numpy toolz jinja2 ramda artiqpkgs.migen artiqpkgs.misoc ];
checkInputs = with pkgs.python3Packages; [ pytest pytest-timeout pytest-flake8 ]; checkInputs = with pkgs.python3Packages; [ pytest-runner pytestCheckHook pytest-timeout ];
checkPhase = "pytest";
# migen/misoc version checks are broken with pyproject for some reason # migen/misoc version checks are broken with pyproject for some reason
postPatch = '' postPatch = ''
@ -82,6 +82,8 @@
--replace '"migen@git+https://github.com/m-labs/migen",' "" --replace '"migen@git+https://github.com/m-labs/migen",' ""
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace '"misoc@git+https://github.com/m-labs/misoc.git",' "" --replace '"misoc@git+https://github.com/m-labs/misoc.git",' ""
# pytest-flake8 is broken with recent flake8. Re-enable after fix.
substituteInPlace setup.cfg --replace '--flake8' ""
''; '';
}; };
binutils = { platform, target, zlib }: pkgs.stdenv.mkDerivation rec { binutils = { platform, target, zlib }: pkgs.stdenv.mkDerivation rec {
@ -116,7 +118,6 @@
fwtype = if builtins.elem variant sat_variants then "satman" else "runtime"; fwtype = if builtins.elem variant sat_variants then "satman" else "runtime";
firmware = rustPlatform.buildRustPackage rec { firmware = rustPlatform.buildRustPackage rec {
name = "firmware"; name = "firmware";
src = ./src; src = ./src;
cargoLock = { cargoLock = {
@ -135,7 +136,7 @@
pkgs.llvmPackages_9.clang-unwrapped pkgs.llvmPackages_9.clang-unwrapped
]; ];
buildPhase = '' buildPhase = ''
export XARGO_RUST_SRC="${rustPlatform.rust.rustc}/lib/rustlib/src/rust/library" export XARGO_RUST_SRC="${rust}/lib/rustlib/src/rust/library"
export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_9.clang-unwrapped.lib}/lib/clang/9.0.1/include" export CLANG_EXTRA_INCLUDE_DIR="${pkgs.llvmPackages_9.clang-unwrapped.lib}/lib/clang/9.0.1/include"
export CARGO_HOME=$(mktemp -d cargo-home.XXX) export CARGO_HOME=$(mktemp -d cargo-home.XXX)
make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ${fwtype} make TARGET=${target} GWARGS="${if json == null then "-V ${variant}" else json}" ${fwtype}
@ -257,7 +258,7 @@
name = "fmt-check"; name = "fmt-check";
nativeBuildInputs = [ nativeBuildInputs = [
rustPlatform.rust.cargo rust
]; ];
phases = [ "buildPhase" ]; phases = [ "buildPhase" ];
@ -363,8 +364,7 @@
devShell.x86_64-linux = pkgs.mkShell { devShell.x86_64-linux = pkgs.mkShell {
name = "artiq-zynq-dev-shell"; name = "artiq-zynq-dev-shell";
buildInputs = with pkgs; [ buildInputs = with pkgs; [
rustPlatform.rust.rustc rust
rustPlatform.rust.cargo
llvmPackages_9.llvm llvmPackages_9.llvm
llvmPackages_9.clang-unwrapped llvmPackages_9.clang-unwrapped
gnumake gnumake
@ -378,7 +378,7 @@
artiqpkgs.vivado artiqpkgs.vivado
binutils-arm binutils-arm
]; ];
XARGO_RUST_SRC = "${rustPlatform.rust.rustc}/lib/rustlib/src/rust/library"; XARGO_RUST_SRC = "${rust}/lib/rustlib/src/rust/library";
CLANG_EXTRA_INCLUDE_DIR = "${pkgs.llvmPackages_9.clang-unwrapped.lib}/lib/clang/9.0.1/include"; CLANG_EXTRA_INCLUDE_DIR = "${pkgs.llvmPackages_9.clang-unwrapped.lib}/lib/clang/9.0.1/include";
OPENOCD_ZYNQ = "${zynq-rs}/openocd"; OPENOCD_ZYNQ = "${zynq-rs}/openocd";
SZL = "${zynqpkgs.szl}"; SZL = "${zynqpkgs.szl}";