Compare commits

..

2 Commits

Author SHA1 Message Date
4f79ee962c fix cargo-xbuild dependency 2025-02-17 15:15:33 +08:00
d4105b79e7 flake: update dependencies 2025-02-17 15:15:22 +08:00
2 changed files with 17 additions and 17 deletions

30
flake.lock generated
View File

@ -11,11 +11,11 @@
"src-pythonparser": "src-pythonparser" "src-pythonparser": "src-pythonparser"
}, },
"locked": { "locked": {
"lastModified": 1739435991, "lastModified": 1739502015,
"narHash": "sha256-mmS2XPIh9EeUGvJQYmlHV0k/UCYmQ0HFmhhETKW/t2k=", "narHash": "sha256-IrFzxGNbi6V4SVNb49T9ZXFZDZPA65hdPkfoVmDhBHs=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "77029874364ff8493081e8000ef964c9ba1ca965", "rev": "994f60edd5bb646ad4c29744c471a70b8fa6046e",
"revCount": 9155, "revCount": 9158,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/artiq.git" "url": "https://github.com/m-labs/artiq.git"
}, },
@ -70,11 +70,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1739214665, "lastModified": 1739446958,
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "narHash": "sha256-+/bYK3DbPxMIvSL4zArkMX0LQvS7rzBKXnDXLfKyRVc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "rev": "2ff53fe64443980e139eaa286017f53f88336dd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -174,11 +174,11 @@
"src-misoc": { "src-misoc": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739428011, "lastModified": 1739436988,
"narHash": "sha256-ymvkR6ldCp+Kj29YGnaVuoM9Vi2GNxaqPlK0DWOCcgQ=", "narHash": "sha256-zEihEV6kqRtrZWyu7uCNyHOXE/rluVloPuT4ECYVJ+g=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "47a3d8096dfae234599fd5406807cf2d92b6a351", "rev": "e3f4fd040b90b05d580bf578ca49244f0b7d861a",
"revCount": 2473, "revCount": 2483,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/m-labs/misoc.git" "url": "https://github.com/m-labs/misoc.git"
@ -229,11 +229,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1739437497, "lastModified": 1739756131,
"narHash": "sha256-hqsma8ZGBwAcr0OJBcqZLlT8EuhcCW7aYe96Nz153Bs=", "narHash": "sha256-pSRdhgBSi75cYB9PweNwsJk00/ksLpwt39NoG/43WEE=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "1c3912e34e43f087a8427509dfb3785b04b6a33e", "rev": "4f90c61442c5b64acf149b1837aa9a5aa7659a38",
"revCount": 679, "revCount": 680,
"type": "git", "type": "git",
"url": "https://git.m-labs.hk/m-labs/zynq-rs" "url": "https://git.m-labs.hk/m-labs/zynq-rs"
}, },

View File

@ -134,7 +134,7 @@
nativeBuildInputs = [ nativeBuildInputs = [
pkgs.gnumake pkgs.gnumake
(pkgs.python3.withPackages(ps: [ ps.jsonschema artiqpkgs.migen migen-axi artiqpkgs.misoc artiqpkgs.artiq ])) (pkgs.python3.withPackages(ps: [ ps.jsonschema artiqpkgs.migen migen-axi artiqpkgs.misoc artiqpkgs.artiq ]))
zynqpkgs.cargo-xbuild pkgs.cargo-xbuild
pkgs.llvmPackages_14.llvm pkgs.llvmPackages_14.llvm
pkgs.llvmPackages_14.clang-unwrapped pkgs.llvmPackages_14.clang-unwrapped
]; ];
@ -380,7 +380,7 @@
llvmPackages_14.clang-unwrapped llvmPackages_14.clang-unwrapped
gnumake gnumake
cacert cacert
zynqpkgs.cargo-xbuild pkgs.cargo-xbuild
zynqpkgs.mkbootimage zynqpkgs.mkbootimage
openocd openocd
openssh rsync openssh rsync