den512
/
artiq-zynq
forked from M-Labs/artiq-zynq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: den512:f1ee3a758446a489f43a8fdfdcb1f47fe05b12f8
Branches Tags
den512:sys_clk_issue_1
den512:master
den512:release-7
den512:dev
den512:release-6
M-Labs:master
M-Labs:release-7
M-Labs:release-6
...
compare: den512:f52c155006a4357d70bbdc787234092104f50dfe
Branches Tags
den512:sys_clk_issue_1
den512:master
den512:release-7
den512:dev
den512:release-6
M-Labs:master
M-Labs:release-7
M-Labs:release-6

2 Commits
f1ee3a7584 ... f52c155006

Author SHA1 Message Date
Sebastien Bourdeauducq f52c155006 flake: fix and cleanup builds 2023-06-02 18:36:05 +08:00
Sebastien Bourdeauducq 4c605f21c9 flake: update dependencies 2023-06-02 17:22:27 +08:00
2 changed files with 7 additions and 10 deletions
Show Stats Expand all files Collapse all files

8
flake.lock
View File

@ -11,11 +11,11 @@
"src-pythonparser": "src-pythonparser"
},
"locked": {
"lastModified": 1685418630,
"narHash": "sha256-Sbt2LoIBy01ttHmHsgwMgTLFoV9fgKrYL8RpE4hykog=",
"lastModified": 1685697660,
"narHash": "sha256-gRaec3rm64H36KKfFY4BGh37gWPg1FFqYH4WXK6+108=",
"ref": "refs/heads/master",
"rev": "0941d3a29a61d250ff02ddfafefd2c9e8c9350e3",
"revCount": 8368,
"rev": "29cb7e785d94cbb6f0633f9195560b92c0eed335",
"revCount": 8386,
"type": "git",
"url": "https://github.com/m-labs/artiq.git"
},

9
flake.nix
View File

@ -129,8 +129,7 @@
nativeBuildInputs = [
pkgs.gnumake
(pkgs.python3.withPackages(ps: (with artiqpkgs; [ ps.jsonschema migen migen-axi misoc artiq ])))
artiqpkgs.artiq
(pkgs.python3.withPackages(ps: [ ps.jsonschema artiqpkgs.migen migen-axi artiqpkgs.misoc artiqpkgs.artiq ]))
zynqpkgs.cargo-xbuild
pkgs.llvmPackages_9.llvm
pkgs.llvmPackages_9.clang-unwrapped
@ -156,8 +155,7 @@
gateware = pkgs.runCommand "${target}-${variant}-gateware"
{
nativeBuildInputs = [
(pkgs.python3.withPackages(ps: (with artiqpkgs; [ ps.jsonschema migen migen-axi misoc artiq ])))
artiqpkgs.artiq
(pkgs.python3.withPackages(ps: [ ps.jsonschema artiqpkgs.migen migen-axi artiqpkgs.misoc artiqpkgs.artiq ]))
artiqpkgs.vivado
];
}
@ -241,8 +239,7 @@
name = "gateware-sim";
nativeBuildInputs = [
(pkgs.python3.withPackages(ps: (with artiqpkgs; [ migen migen-axi artiq ])))
artiqpkgs.artiq
(pkgs.python3.withPackages(ps: [ artiqpkgs.migen migen-axi artiqpkgs.artiq ]))
];
phases = [ "buildPhase" ];